Comments initial implementation