Huge push, lots of cleanup. More clean-up to come.

For some reason, IntelliJ has difficultly with Damageable casts (unlike Eclipse)