Mmm topics (not my name!)

Rebase and complete PR #77