WIP - Started rewriting Store class