Project 1 Mostly Done