Added stub observer class, some cleanup.