Final pre-testing changes

Going to actually test this now I guess?