working on pulling subcomments
Merge branch 'steven'