Added ability to import
Tidied up Account loading so it actually popuates the database