Mmm topics

Rebase and complete PR #77