Jumped the gun on generics, removed, will see if needed later