Revert "Revert "Week 7 Stuff""

This reverts commit 9eea9697c8f32bf416168db78303dc0fbed9990a.