Refactored to use topics support in natty

Ah, cool. Looks good to merge, @aranhoide