finish implementation of account system