Added a small search feature. This will need a lot of tweaking