Commit #2 for course project