added discussion
Merge branch 'feature/discussion' into stage