36d5402 progress towards #8