Start working on type searching features.

ah looks like I moved it, and during a rebase it ended up duplicated.