Feature/47 hhaccount conversion

Resolves all the HH Conversion-related bugs

#835 #836 #834 #832 #830 #752 #751