Project 3 Progress 2 (Spring 2016)