Removed some unused base classes
Added first go at observables