A lot of changes, unsure as to what has all been done since whenever I last committed
Some changes
wip on cs184b