First commit of final project