Observer system redux (23/48)

Observer system redux