Added the zip of jeff's conflicting commit

Added a zipped version of jeff's final commit which conflicted with the
ones we were working on today. If you (jeff) could take the zip and
integrate the code from it into our current files, that would be great.