Moved search to fund scope
 oved captables to JS