comments working
Merge branch 'comments' into nightly