Observer system redux (45/48)

Observer system redux