working on search function
julian's commit