Separated into weeks 1 and 2
Cleaned up week 2