Started work on search funcitons