Finish implementing pause/resume functionality and clear out the related TODO