Eliminating use of generics; pretty sure that was the wrong route.