Added TODO - inefficient lookahead handling