Bringing the DC site closer to Tucson, and first run at cleaning up code.