Changed out more variabes

Taking p1 health out and replacing with array