Re-org to be on-resume/on-pause based
Not working yet, but got almost all the pieces in place