working on ES pulling comments properly