First step of the resume feature from #24.

Ok I'll move it at the same time.