Fixed V2 search, refactor all around
comment clean up
Added data model for search results