still broken but getting there