Split out from main HERMIT repo