Most recent working code for proj2