Implement merging system
Try to implement strings
Merge branch 'search'