WIP: adding support for single and multi-line comments