adding some dynamism
Merges changes from Sam
Search fully works