Extensive rewrite of hmparser
Still buggy, but making progress