Changed some of the NSArrays to NSStrings for now and woking with the internal class