Added all the stuff we changed since the last time I had tried to commit