Observer system redux (26/48)

Observer system redux