Adding support for cars, still working on the search criteria