FIXME: 'storage' was used before it was defined.