Week 2 work and Week 1 refactor