Comments interface and collab stuff
Fixed conflict