@sebv we still need to agree on parameters in wd before @lukeis can use the new methods here