Pmeyer/spanishpartners

@teeyoutan Please review!