Revert "Revert "Week 2 in-class work""

This reverts commit e4adde3ea72606903c3da92f8af98d00a2ade79d.