Moved waterfall calculator to inherit from interface