[WIP] Add Comment Feature