MIFOSX-314 Make adding new accounts of a particular type easier
MIFOSX-314: merge in aviks work and fix conflicts and format code.