Since this is for dev I'm going to leave like this for now, but we could