working on formatting
CB-5910: added initial implementaiton of search