Add new comment

Yes, keywords are in the TODO list