Fix, Week 3 initial commits