Waterfall Steps Redesigned

Closes #17
Prepares for implementation of #21
Reinvestment Test not working until the triggers are implemented