Week 3 fixed, and working