Observer system redux (39/48)

Observer system redux