Partial framework overhaul