Feature/kevin/deep search

Please do not deploy, for code review.