Week4

WIP - DO NOT MERGE

(but, y'know, give me feedback)