LOTSA SHIT

DID ALLLLLL THE SHIT TO THIS PROGRAM
NA
changes to file commits
Merge remote-tracking branch 'origin/master' into Dorian's-branch