50% progress on metadata overrides for #38