progress
Update to add search support