Total framework overhaul part 2