Work on the comments
Frontend work