need to add conditionals to where comments are, almost there