Really fix the whole thing.