Added some more variables - still working through story