Comments working

Except for the referring to the event
still not sure on that