COMMIT TA CHANGES!!!!!!!!!!!!!!!!!!  BLAAAAARRRRGGGGHHHHUHJK#BNRWBG#UWFJNK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Minor cleaning up right now
Minor fixes and changes
Merge branch 'Joev2'