Course Project, Commit 2