I think this needs a little more thought, but shouldn't hold up this PR.