- trashed some unneeded classes
- got things more-or-less working with 3 basic test cases passing