Some more progresss on Cascading

With this in here, the build will run these twice