Mostly re-written storage wrapper