Cleaning up a few classes and moving towards a stable testable environment.