Still broken, but halfway there.