Cleaned up store a little bit and did some balancing
Merge remote-tracking branch 'origin/JohnDev-Branch'