Base work towards #12.