Major v2 changes

Caching added
Search revised (still some work needed)
Add some options.. more coming