Lots of refactoring to conform to the new MVC prototype interface. Added KeyringController class.