Looks like Nick has made some movement on this today: https://ngerakines.leaflet.pub/3miowjw5c222y