Lots of rework - still broken though