Massive commit that I would never do at once if I was working with
anyone else