Abstracting away the storage class. Preparing for using sqlite. And of course a few mixedCase fixes found while testing.