diff --git a/atst/routes/portfolios/task_orders.py b/atst/routes/portfolios/task_orders.py
index f9428be2..928d15db 100644
--- a/atst/routes/portfolios/task_orders.py
+++ b/atst/routes/portfolios/task_orders.py
@@ -69,6 +69,11 @@ def view_task_order(portfolio_id, task_order_id):
     )
 
 
+@portfolios_bp.route("/portfolios/<portfolio_id>/task_order/<task_order_id>/review")
+def review_task_order(portfolio_id, task_order_id):
+    return render_template("/portfolios/task_orders/review.html")
+
+
 @portfolios_bp.route(
     "/portfolios/<portfolio_id>/task_order/<task_order_id>/invitations"
 )
diff --git a/templates/components/datepicker.html b/templates/components/datepicker.html
new file mode 100644
index 00000000..c597aeb5
--- /dev/null
+++ b/templates/components/datepicker.html
@@ -0,0 +1,50 @@
+{% from "components/icon.html" import Icon %}
+
+{% macro DatePicker(field) -%}
+
+  <date-selector inline-template>
+    <div class="usa-input date-picker" v-bind:class="{ 'usa-input--success': isDateValid }">
+      <input v-bind:value="formattedDate" type="hidden" />
+
+
+      <div class="usa-form-group usa-form-group-month">
+        <label>Month</label>
+        <input
+          max="12"
+          maxlength="2"
+          min="1"
+          type="number"
+          v-bind:class="{ 'usa-input-error': !isMonthValid }"
+          v-model="month"
+        />
+      </div>
+
+      <div class="usa-form-group usa-form-group-day">
+        <label>Day</label>
+        <input
+          maxlength="2"
+          min="1"
+          type="number"
+          v-bind:class="{ 'usa-input-error': !isDayValid }"
+          v-bind:max="daysMaxCalculation"
+          v-model="day"
+        />
+      </div>
+
+      <div class="usa-form-group usa-form-group-year">
+        <label>Year</label>
+        <input
+          maxlength="2"
+          type="number"
+          v-model="year"
+        />
+      </div>
+
+      <div class="usa-form-group-date-ok" v-if="isDateValid">
+        {{ Icon("ok", classes="icon--green") }}
+      </div>
+
+    </div>
+  </date-selector>
+
+{%- endmacro %}
diff --git a/templates/portfolios/task_orders/show.html b/templates/portfolios/task_orders/show.html
index 8c68c7f8..cd04a4bc 100644
--- a/templates/portfolios/task_orders/show.html
+++ b/templates/portfolios/task_orders/show.html
@@ -93,7 +93,7 @@
           complete=all_sections_complete) %}
           <div class="task-order-next-steps__action col">
             <a
-              href="{{ url_for("task_orders.new", screen=1, task_order_id=task_order.id) }}"
+              href="{{ url_for("portfolios.review_task_order", portfolio_id=portfolio.id, task_order_id=task_order.id) }}"
               class="usa-button usa-button-primary">
                 Edit
             </a>
diff --git a/templates/task_orders/new/app_info.html b/templates/task_orders/new/app_info.html
index 85b52a6c..37813827 100644
--- a/templates/task_orders/new/app_info.html
+++ b/templates/task_orders/new/app_info.html
@@ -4,6 +4,7 @@
 {% from "components/options_input.html" import OptionsInput %}
 {% from "components/date_input.html" import DateInput %}
 {% from "components/multi_checkbox_input.html" import MultiCheckboxInput %}
+{% from "components/datepicker.html" import DatePicker %}
 
 {% block heading %}
   {{ "task_orders.new.app_info.section_title"| translate }}
@@ -11,6 +12,17 @@
 
 {% block form %}
 
+<div class="usa-input">
+  <label>
+    <div class="usa-input__title">Date picker</div>
+  </label>
+
+  <span class="usa-form-hint">For example: 04 28 1986</span>
+
+  {{ DatePicker() }}
+</div>
+
+
 <!-- App Info Section -->
 <h3 class="task-order-form__heading subheading">{{ "task_orders.new.app_info.basic_info_title"| translate }}</h3>
 {{ TextInput(form.portfolio_name, placeholder="The name of your office or organization") }}