finished 2c, working on 2d