Unfinished charge phase

Checking in just to get this in.  Breaks movement for now, but the
code's still there.  Just need to toggle something.