Second commit from my mac, ttesting password caching.