Making progress with this mess.