stubbed out some classes and methods, rethinking the structure