Still broken but starting to get there