Charged attacks are now in and fully functional. All old functionality
is still in place. May need to simplify at some point, but for now it
all seems to be working.