New file.  separate out waterfall to its own