Observer system redux (31/48)

Observer system redux