Removed old classes and started w/ observable pattern