Store selector - WIP
Merge