Fix up
In the process of adding and fixing code merges via my phone I managed to muck everything up. The commits are still here to give proper authorship, however I have added back everything that was lost from me being messy with it.