Adding all the stuff

NOW