Working on endpoint resolution and connection