Overhaul entirely, redone and (in theory) finished.