Some more mapping and I updated the database a bit more. Still needs
more mapping - will finish tomorrow. I commented some code in
AccountsController so that might behave different.