Major framework overhaul

Also other things.