swing fish for GUI client. Refactored discovery