starting attack. Fixing up Animation.

Refactoring is basically done at this point. I think.