working on adding topics, merging stuff