refactor - collapse to one method
refactor - pulled service finder into worldwide org
refactor - use the new method everywhere else
stub tests for new class method
don't return from block
Fix whitespace errors