more refactoring, moving things around, breaking things, making sure stuff doesn't work.