Renamed ip to publicip to prevent name conflict
Added TODO message