Added a bunch of stuff with Lee's help.
Merge origin/master
deleted bad files.