Continued merge of savingsAccount into Account