More work, some revision.