WIP moved code that handles continue lists