Week 5 submission

All done!
Revert "Week 5 submission"

This reverts commit e65c333bbcfcd97e0b3978cebb6bfb89160be019.
Revert "Revert "Week 5 submission""

This reverts commit d1e36a064cd878468e96a5462007936c9f94a641.