Added basic search functionality - templates are not done yet though