Renamed everything, and close to getting unittest framework to run.
See last commit message.
Deleted replicate code, and got the tests to pass
Changes?