Moving towards a simpler, working hg