Is this something we want to keep in production?