resolving code TODOs part 2