Started implemented search and made more use of api