Mass Overhaul third commit
Third commit, after crash