remove comment/todo
add line numbers when parsing for error reporting