Commented a bunch of code and now my fingers hurt.  I left the
environment class alone as we didn't really change much in it and it
only really has to do with reading in the file.  I did clean up the
environment class of commented out code.