Added a few more of the variables - Script still not ready to be used