Move waterfall generation to core.  GUIs now only display it.