project 1 done, project 2 mostly done, needs debugging and tests