Working on the parting of the array
Cleaned out the generics code