refactoring, initial work on EPP connection