Observer system redux (34/48)

Observer system redux