I like trains

Commits described within themselves.

Fixes #625