Started to add topics
More topic refactoring
More topic refactoring
More topic refactoring
Topics API complete, still need more tests though