Trying out some ideas for the parser