This breaks some things I think, so we'll need to add tests for those. I'll look through the history and write some more tests in a couple days.