Initial entitlement code review with Pierre