Total framework overhaul part 1