Generics fixed. Solution works.