Now with more keychain goodness.