This looks like something we can send upstream?