Added all the stuff we did from last time