more work towards #3