Tighened up the code.  Added a generic search method that will take any search params.  Ready to use.