Good comment. We may be able to start implementing this tomorrow (2/27) after discovery is merged in