Add ssl encryption
Add public/private pair
Resolve conflict