More work on first draft of Observer.