Add logic for searching
Started working on tests for FieldSearch