diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift
index 61d5350..1820266 100644
--- a/VDSSample/ViewControllers/InputFieldViewController.swift
+++ b/VDSSample/ViewControllers/InputFieldViewController.swift
@@ -19,6 +19,12 @@ class  InputFieldViewController: BaseViewController<InputField> {
                            items: InputField.HelperTextPlacement.allCases)
     }()
 
+    lazy var inputTypePickerSelectorView = {
+        PickerSelectorView(title: "",
+                           picker: self.picker,
+                           items: InputField.FieldType.allCases)
+    }()
+
     var disabledSwitch = Toggle()
     var requiredSwitch = Toggle()
     var labelTextField = TextField()
@@ -31,6 +37,18 @@ class  InputFieldViewController: BaseViewController<InputField> {
     var tooltipTitleTextField = TextField()
     var tooltipContentTextField = TextField()
     
+    //FieldType sections
+    
+    //password
+    var hidePasswordButtonTextField = TextField()
+    var showPasswordButtonTextField = TextField()
+    lazy var passwordSection = FormSection().with {
+        $0.title = "Password Settings"
+        $0.addFormRow(label: "Hide Button", view: hidePasswordButtonTextField)
+        $0.addFormRow(label: "Show Button", view: showPasswordButtonTextField)
+        $0.isHidden = true
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
         addContentTopView(view: component)
@@ -53,6 +71,9 @@ class  InputFieldViewController: BaseViewController<InputField> {
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
         addFormRow(label: "ToolTip Content", view: tooltipContentTextField)
+        addFormRow(label: "Field Type", view: inputTypePickerSelectorView)
+        
+        append(section: passwordSection)
         
         requiredSwitch.onChange = { [weak self] sender in
             self?.component.required = sender.isOn
@@ -114,6 +135,19 @@ class  InputFieldViewController: BaseViewController<InputField> {
                 self?.updateTooltip()
             }.store(in: &subscribers)
         
+        //field types
+        //password
+        hidePasswordButtonTextField
+            .textPublisher
+            .sink { [weak self] text in
+                self?.component.hidePasswordButtonText = text
+            }.store(in: &subscribers)
+
+        showPasswordButtonTextField
+            .textPublisher
+            .sink { [weak self] text in
+                self?.component.showPasswordButtonText = text
+            }.store(in: &subscribers)
     }
     
     func setupModel() {
@@ -137,6 +171,7 @@ class  InputFieldViewController: BaseViewController<InputField> {
         //setup UI
         surfacePickerSelectorView.text = component.surface.rawValue
         helperTextPlacementPickerSelectorView.text = component.helperTextPlacement.rawValue
+        inputTypePickerSelectorView.text = component.fieldType.rawValue
         disabledSwitch.isOn = !component.isEnabled
         requiredSwitch.isOn = component.required
         labelTextField.text = component.labelText
@@ -162,6 +197,11 @@ class  InputFieldViewController: BaseViewController<InputField> {
         helperTextPlacementPickerSelectorView.onPickerDidSelect = { [weak self] item in
             self?.component.helperTextPlacement = item
         }
+        
+        inputTypePickerSelectorView.onPickerDidSelect = { [weak self] item in
+            self?.component.fieldType = item
+            self?.updateFormSections()
+        }
     }
     
     func updateTooltip() {
@@ -171,6 +211,39 @@ class  InputFieldViewController: BaseViewController<InputField> {
         component.tooltipModel = !title.isEmpty || !content.isEmpty ? .init(title: title,
                                                                             content: content) : nil
     }
+    
+    func updateFormSections() {
+        passwordSection.isHidden = true
+        
+        switch component.fieldType {
+        case .text:
+            break
+            
+        case .number:
+            break
+            
+        case .inlineAction:
+            break
+            
+        case .password:
+            passwordSection.isHidden = false
+            
+        case .creditCard:
+            break
+            
+        case .tel:
+            break
+            
+        case .date:
+            break
+            
+        case .securityCode:
+            break
+            
+        @unknown default:
+            break
+        }
+    }
 }