stubbed some new classes

beginning to separate some logic