WIP while I wait on some potential issues from the FNAL folks