Project 2 working and finished