Razor attempt3

Remove the old skeleton and the old framework logic. Replace with the new framework logic.