more work on external safir_generated builds
more work