Initial checkin
Added search function