Restructure to make room for nfhedm