merged tests with master. All i did was rename some things and break up the source into manageable files. now to switch back to "tests" branch and do some testing and modifying for real