Commented out broken stuff and stuff
Merge remote-tracking branch 'origin/master' into temp-branch