Changes from last weeks solution and Week 4 solution complete