Removing unecessary todo
Sending to correct server URL
Fixing TODOs