Observer system redux (43/48)

Observer system redux