Added some index replacements

Started changing the variables to index array numbers