Merge topics

First pass through merge/split topics. (according to the experiment I did a while ago, I don't remember where/what that branch is :))