Implmented genereics and am working on solver.