Feature/47 hhaccount conversion

Don't merge yet, still need some UI changes to the front end, but the logic should be in place, so want to run it against the HEAD