Total framework overhaul part 3