ConnectionService refactor: Solved all eclipse errors, time to test