#6 Massive reorganization
#6 More thorough renovation
#6 Got all tests to run, though few pass