minor progress
offline work to merge.