Final commit for Course Project