I know, I know, many commits, few pushes, but it's late and I keep thinking it's finished.