Observer system redux (28/48)

Observer system redux