progress towards a working tp #381