Should we scope this to limit its access to internal code? I did try quickly on Friday night but failed (I was tired though).