Broke out tables with proper keys.  Saving only on demand (fixed bug where auth shell being saved too early).