Updating to new HCRFramework. Complete overwrite