Crappy changes, still figuring out how to test this thing