Working on the player scripting.
Merged most recent changes with my local files
Pulled down changes from desktop and merged.