merging in some more like this work