Fixed previous things.
Storeable without unit tests.