Still broken, but not completely