added code to support future plans
removed unneeded enum
added search method
added search, lots of tweaks, full refresh option