ok, this landed. fire away on merging things.