Updated to use sherpa and chipper/single-file