Add a bunch of stuff (Terrible commit message)