Mh parser2

parser works, I'll merge it with the master