Started work on comments for the front-end