cleanup collection
maintain interface on collection search methods
use collection and models for data