add the rest of the stuff