waterfall ftw!

Fixes #13