Splash some of this on

Fixes #114
Merge pull request #116 from mccoyst/splash

Splash some of this on