adding the rest of the crud for keychains