Big stupid crappy commit that contains hundreds of lines of code. I'm a bad Gitter, I know.