Total framework overhaul part 5