more work in progress ...