add all the other stuff