Work in progress towards #16