work on todo's