Crichton refactoring registry 150

@fosdev @jcarres-mdsol @sheavalentine-mdsol  

Please merge. Last comment addressed.