First step of the resume feature from #24.