Tianlu Yuan

I've moved the HGM code from master into a new branch `git checkout --track origin/hgm`. At some point we should get that working.