moving things from a fix, still broken but better