done some more work...