More progress on the parser, beginnings of info classes