Lots of stuff, things still broken