Still work in progress, but slightly less so.