#353 implement resume and step code