updated to-dos and inserted some hooks for 'resume' function