Still broken, but closer