Primary work on Stores. Needs more display / menu interaction
Merging.