feat: implement proper Store with Muscle Group #2

Open
Flycro wants to merge 2 commits from fix_store into main

2 Commits (main)