Stubbed out most of the classes and have some tests