working on all the todo's.. in client