Adding TODOs for resumption later