merging stuff, not quite working...seems to be getting there