         case .ValuePickerChoiceQuestion:
             return NSLocalizedString("Value Picker Choice Question", comment: "")
             
+        case .ValidatedTextQuestion:
+            return NSLocalizedString("Validated Text Question", comment: "")
+            
         case .ImageCapture:
             return NSLocalizedString("Image Capture Step", comment: "")
-
-        case .ValidatedTextQuestion:
-            return NSLocalizedString("Validated Text Question", comment: "")
 
         case .EligibilityTask:
             return NSLocalizedString("Eligibility Task Example", comment: "")

        return ORKOrderedTask(identifier: String(Identifier.ValuePickerChoiceQuestionTask), steps: [questionStep])
    }

    /// This task presents the image capture step in an ordered task.
    private var imageCaptureTask: ORKTask {
        // Create the intro step.
        let instructionStep = ORKInstructionStep(identifier: String(Identifier.IntroStep))
        
        instructionStep.title = NSLocalizedString("Sample Survey", comment: "")
        
        instructionStep.text = exampleDescription
        
        let handSolidImage = UIImage(named: "hand_solid")!
        instructionStep.image = handSolidImage.imageWithRenderingMode(.AlwaysTemplate)
        
        let imageCaptureStep = ORKImageCaptureStep(identifier: String(Identifier.ImageCaptureStep))
        imageCaptureStep.optional = false
        imageCaptureStep.accessibilityInstructions = NSLocalizedString("Your instructions for capturing the image", comment: "")
        imageCaptureStep.accessibilityHint = NSLocalizedString("Captures the image visible in the preview", comment: "")
        
        imageCaptureStep.templateImage = UIImage(named: "hand_outline_big")!
        
        imageCaptureStep.templateImageInsets = UIEdgeInsets(top: 0.05, left: 0.05, bottom: 0.05, right: 0.05)
        
        return ORKOrderedTask(identifier: String(Identifier.ImageCaptureTask), steps: [
            instructionStep,
            imageCaptureStep
            ])
    }
    
    /**
    This task demonstrates asking for text entry. Both single and multi-line
    text entry are supported, with appropriate parameters to the text answer
    format.
    */
    private var validatedTextQuestionTask: ORKTask {
        let answerFormatEmail = ORKAnswerFormat.emailAnswerFormat()
        let stepEmail = ORKQuestionStep(identifier: String(Identifier.ValidatedTextQuestionStepEmail), title: NSLocalizedString("Email", comment: ""), answer: answerFormatEmail)

                    .TimeIntervalQuestion,
                    .TimeOfDayQuestion,
                    .ValuePickerChoiceQuestion,
                    .ValidatedTextQuestion,
                    .ImageCapture,
                ]),
            TaskListRowSection(title: "Onboarding", rows:
                [
