some more work progress...