Should this be uncommented? Also, lets use an environment variable or something not commenting/uncommenting code.