added TODO and added work-in-progress pointer persistence