Start of working on making the parser even more dumb