Added basic waterfall
Merge branch 'waterfall'