Week 7 Stuff
Revert "Week 7 Stuff"

This reverts commit f5acb28aa811a8300c47643e2077f49e135003ea.