adding accounts functionality
fixed merge conflict