initial forum commit
Merge branch 'refactor-forum'