First implementation of storage wrapper
make sure url is updated on all code paths