Add in passing of variables