Changed the way search worked so a generic type can be given. It isn't working quite right still.