Added Evan's changes

Evan put new files in DropBox so I'm merging in his changes.