Most recent Version

Me and zachary worked on it some yesterday. I downloaded his version and
manually merged mine into it.