Amost done with comment/highlight front end functionality