Update topics to be instances instead of static

Not the best solution, but definitely better
Update use of topics in other classes
Update usage of topics to reflect change