Animate death.

Plus some refactoring.
`cargo update`
Merge pull request #19 from dpc/devel

Animate death.