Basic search complete. Need to implement search for enums