Did a lot of stuff; my bad on not doing more commits