Update stuff for day 2. Cameron did most of the work for this commit, but I am taking credit mwa ha ha.