Getting closer but it's still a nightmare