Observer system redux (33/48)

Observer system redux