Last set of changes before we can start trying to deploy to our new test environment.