Refactored the architecture a bit, and created a new mechanism for storing authentication tokens.