Added the search helper method. This will probably need changing later once we tie everything up but figured its a decent start
Merge origin/master