First commit of Project 2.  Error fix for project 1