Updating because I don't remember the last time I commited and I'm not sure exactly what changes I made (this probably isn't a smart idea)