Lots of Lots of Updates

Rhett Paul and John Watching...
More Changes

Code Changes