Feature/47 hhaccount conversion