Project 2 almost finished