Upgrade

Refactore, add bar energy, add store