Still not done, but tantalizingly close