Uncommenting code now that we are ready to test.