Adding bits to support sample searches
Adding in some dynamically generated sample searches