changes to storage system

move to shared pointers for tracking storage