more TODO and DONE