I'm gonna test some fancy rebase and squashing, then delete this repo