Added NSUserDefaults storage, for good measure