Refactor into modules. Establish JQL methods to increment searches.