smooth out new class hierarchy to current state of the application. looking good so far.