I'm currently, after some consideration and advice, doing a bit of a rework of Fiona.