Storage - IN PROGRESS - submitted for review/comment only