Lots of changes

I should have branched… I’m not using git all that well yet.