server TODOs added