Rest of the previous commit because I am bad at git.