Interim checkin: lots of key store class implementation