Little more work towards #31