Closes #32. Use path.storage