updated todo for further work