Overhaul

Complete new build. No more Starkers reliance.