Add storage. Fixes #12