Adding TODOs for when we resume