Animate death.

Plus some refactoring.
`cargo update`