Fixes #1 - Don't pass Store around