First round commits for final project