Super commit of lots of things done, see the readme/notes for what was done.