Hopefully finished up the Project clas