authorization refactoring; now we can add additional accounts