added server
updated ToDo