Initial attempt at charge-up moves
Merge pull request #2 from funcdoor/fixes

Initial attempt at charge-up moves