Towards #28 ...