Yeah, it's probably worth adding in this capability eventually!