Work in progress on resume and skip functionality