Fixingstuff

Reverting to last non-fightingteam commit. Sorry for how late this reversion is. Other team commits plus 100+ merge conflicts due to eclipse cleanup caused severe issues, and delayed the push of the fix. Please review your code to make sure of functionality as we found breaks from commits prior to our own.