Lots of changes. I was silly not to do incremental commits
very silly