Moved the Store interface to a real key/value store

I know it was already there, but this needs to removed it is unsafe.