Further work on account system implementation.
Refactor.