Major refactor for new BW & Rory; "Pure" framework