adding a whole heap of stuff
merging