Massive Refactoring. Inheritance is no longer needed.