Basic store implementation
Tweaks to database