work in progress

Only a week later than promised. Still plenty of work to do here.