Observer system redux (35/48)

Observer system redux