checkpoint - refactored config mostly working