Refactored.  Solved 1-4.
Sovled 3 more problems. More minor reorganization