Bunch of updates. Should probably commit every save and document
properly.....oh well