First step of the resume feature from #24.

Ok, it is more robust that way.