We really do need testing. I'll fix this then start adding tests tonight.