Next phase of Rock-on framework improvements

[herbert]

I like this and want to back this with a cross-link to another post