CascadeTrtain work (not complete) and src/util changes and additions