So eventually we'll need to switch this to use confit.  It's ok to merge for now to get this work.