initial work to enhance tokenization to add line numbers and comment support