Added all the stuff that's been worked on