made commits in todo not top-level, hope it's ok