refactoring, layers and charge (no shot yet)
Merge branch 'master' of https://github.com/githuli/aquator