part two
resolved TODOs