Starting working on comments