Handle block comments correctly WIP