@justinvdm I'm not sure this code will work in production.  Could you advise, please?  If there's a better way to do this and lines 110 / 114 I'm very happy to change it.