Added commenter
Tried to add auto completion