Final push before rebuilding from scratch!