Observer system redux (44/48)

Observer system redux