[WIP] Mapped superclass

Refactored classes to allow usage out of the box or ease ability to override classes used