Rebuilding the thing from scratch...