Adding TODOs for socket listener calls