more work on todo