Finished with week 7, some bugs still but unrelated to week 7 changes