Everything is back to the point that it was before this massive code overhaul began. FInal steps before merging this into develop will be some unit tests.
