Submission Version

Had to comment out a lot of lines for this to run, but this is the
version we handed in.