1st unfinished mid-refactor checkpoint