Oh my. So much done. Need to get much better at regular commits.
Changed a lot.