Observer system redux (40/48)

Observer system redux