Reverted progress, restarted work on Observer

This due to severe errors in the previous implementation, this is
getting us closer to the solution.