move comments - lazy parsing?