Somewhere here the git history has been mangled, clean up some issues until I go through and start adding tests for them all.