adding a whole bunch of stuff