Final Project commit by Daniel