will get @tattyseal to do some more on this!