Added inheritance logic. Removed files no longer needed. Added rspec.