Half working.  Migrating old storage style to new