moved storage to fog
merge conflicts