Use muid and add HQ settings

Most of this diff will go away once you merge master into your branch