refactored waterfall to allow for reordering of the securities
Merge branch 'walport-water' into testing