Tom's Beta Testing Changes

Adds all the new stuff from the latest beta testing