I'm going to wait for @pjcozzi's guidance on naming stuff, so this probably won't get merged for a while.