Observer system redux (24/48)

Observer system redux