making progress towards #10