Refactored a few things to remove the need to actually use topics.