Splash some of this on

Fixes #114