Committing my changes to take Dori's changes

Currently there is a method in the account.cpp that does not work