Far from working again, but checking in some intermediate work.