Store and options

This will also resolve #37