Compsci part 1
wtf too many commits at once