Nuke the last TODO. All that's left is writing tests, and a lot of them