Project 2 progress 2.0