Observer system redux (37/48)

Observer system redux