Finished the account module refactoring, no caching yet though