Still broken, but more progress