More development changes. Adding search function