diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 5fb5577d..13b5a225 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -39,18 +39,6 @@ todo: create e2e "supersmoke" test that excercises *all* of AyaNova
 todo: load / soak test over the weekend?
 
 
-todo: discuss reporting requirements and if we are at the stage to be making any real world reports yet
-	- stripped down bare reports with as little extra elements on page as humanly possible (as per dashboard UI advice guy)
-	- let the user add any elements if they want them, we want as white a page as possible in our stock reports, clean, simple, no extra bits anywhere
-	- Reports, where it's at and about muted style for them
-		style from dashboard design principle book where every non essential item is a distraction (table grids etc)
-		also would prefer monchromatic with just a tinge of color if any
-
-
-
-
-
-
 
 investigate: hard cap on appointments brought back controlled by client in settings otherwise unusable
 	ideally centered around current date
@@ -952,6 +940,8 @@ BUILD 136 CHANGES OF NOTE
 	has what should be adequate default settings for most cases on windows and linux / mac
 	manual pages for system operator regarding settings
 	manual page for user when they click on "More" link when render report and receive warning about server full try again 
-
+- Added new option in user settings to use browsers default date and time input controls
+	this means it won't use the Android style pickers but whatever the browsers native date and time input controls are
+	did this for automated testing and also for users who may want to use the native browser controls if they don't suck and for people who don't want to leave the keyboard to select
 
 
diff --git a/ayanova/src/components/date-control.vue b/ayanova/src/components/date-control.vue
index 7f26426c..e06c6bfd 100644
--- a/ayanova/src/components/date-control.vue
+++ b/ayanova/src/components/date-control.vue
@@ -2,42 +2,60 @@
   <div>
     <v-row>
       <template v-if="!readonly">
-        <v-col cols="12">
-          <v-dialog v-model="dlgdate" width="300px">
-            <template v-slot:activator="{ on }">
-              <v-text-field
-                v-on="on"
-                prepend-icon="$ayiCalendarAlt"
-                @click:prepend="dlgdate = true"
+        <template v-if="!$store.state.nativeDateTimeInput">
+          <v-col cols="12">
+            <v-dialog v-model="dlgdate" width="300px">
+              <template v-slot:activator="{ on }">
+                <v-text-field
+                  v-on="on"
+                  prepend-icon="$ayiCalendarAlt"
+                  @click:prepend="dlgdate = true"
+                  :value="dateValue"
+                  :label="label"
+                  :rules="rules"
+                  readonly
+                  :error="!!hasErrors"
+                  :data-cy="'dtfpick:' + testId"
+                ></v-text-field>
+              </template>
+              <v-date-picker
                 :value="dateValue"
-                :label="label"
-                :rules="rules"
-                readonly
-                :error="!!hasErrors"
-                :data-cy="'dtfpick:' + testId"
-              ></v-text-field>
-            </template>
-            <v-date-picker
-              :value="dateValue"
-              @input="updateDateValue"
-              :locale="languageName"
-              :data-cy="'dpick:' + testId"
-            >
-              <v-btn text color="primary" @click="$emit('input', null)">{{
-                $ay.t("Delete")
-              }}</v-btn>
-              <v-spacer></v-spacer>
+                @input="updateDateValue"
+                :locale="languageName"
+                :data-cy="'dpick:' + testId"
+              >
+                <v-btn text color="primary" @click="$emit('input', null)">{{
+                  $ay.t("Delete")
+                }}</v-btn>
+                <v-spacer></v-spacer>
 
-              <v-btn text color="primary" @click="setToday()">{{
-                $ay.t("DateRangeToday")
-              }}</v-btn>
-              <v-spacer></v-spacer>
-              <v-btn text color="primary" @click="dlgdate = false">{{
-                $ay.t("OK")
-              }}</v-btn>
-            </v-date-picker>
-          </v-dialog>
-        </v-col>
+                <v-btn text color="primary" @click="setToday()">{{
+                  $ay.t("DateRangeToday")
+                }}</v-btn>
+                <v-spacer></v-spacer>
+                <v-btn text color="primary" @click="dlgdate = false">{{
+                  $ay.t("OK")
+                }}</v-btn>
+              </v-date-picker>
+            </v-dialog>
+          </v-col>
+        </template>
+        <template v-if="$store.state.nativeDateTimeInput">
+          <v-col cols="6">
+            <v-text-field
+              ref="dateField"
+              :value="dateValue"
+              @change="updateDateValue"
+              :readonly="readonly"
+              :disabled="disabled"
+              :label="label"
+              :rules="rules"
+              type="date"
+              :error-messages="errorMessages"
+              :data-cy="'dpick:' + testId"
+            ></v-text-field>
+          </v-col>
+        </template>
       </template>
       <template v-else>
         <v-col cols="12">
diff --git a/ayanova/src/components/time-control.vue b/ayanova/src/components/time-control.vue
index a2c61f4e..0aeec56a 100644
--- a/ayanova/src/components/time-control.vue
+++ b/ayanova/src/components/time-control.vue
@@ -2,41 +2,56 @@
   <div>
     <v-row>
       <template v-if="!readonly">
-        <v-col cols="12">
-          <v-dialog v-model="dlgtime" width="300px">
-            <template v-slot:activator="{ on }">
-              <v-text-field
-                v-on="on"
-                :value="readonlyFormat()"
-                :label="label"
-                prepend-icon="$ayiClock"
-                @click:prepend="dlgtime = true"
-                readonly
-                :error="!!hasErrors"
-                :data-cy="'ttfpick:' + testId"
-              ></v-text-field>
-            </template>
-            <v-time-picker
-              scrollable
-              ampm-in-title
-              :format="hour12 ? 'ampm' : '24hr'"
+        <template v-if="!$store.state.nativeDateTimeInput">
+          <v-col cols="12">
+            <v-dialog v-model="dlgtime" width="300px">
+              <template v-slot:activator="{ on }">
+                <v-text-field
+                  v-on="on"
+                  :value="readonlyFormat()"
+                  :label="label"
+                  prepend-icon="$ayiClock"
+                  @click:prepend="dlgtime = true"
+                  readonly
+                  :error="!!hasErrors"
+                  :data-cy="'ttfpick:' + testId"
+                ></v-text-field>
+              </template>
+              <v-time-picker
+                scrollable
+                ampm-in-title
+                :format="hour12 ? 'ampm' : '24hr'"
+                :value="timeValue"
+                @input="updateTimeValue"
+                :data-cy="'tpick:' + testId"
+                ><v-btn text color="primary" @click="$emit('input', null)">{{
+                  $ay.t("Delete")
+                }}</v-btn>
+                <v-spacer></v-spacer>
+                <v-btn text color="primary" @click="setNow()">{{
+                  $ay.t("Now")
+                }}</v-btn>
+                <v-spacer></v-spacer>
+                <v-btn text color="primary" @click="dlgtime = false">{{
+                  $ay.t("OK")
+                }}</v-btn>
+              </v-time-picker>
+            </v-dialog>
+          </v-col>
+        </template>
+        <template v-if="$store.state.nativeDateTimeInput">
+          <v-col cols="6">
+            <v-text-field
+              ref="timeField"
               :value="timeValue"
-              @input="updateTimeValue"
-              :data-cy="'tpick:' + testId"
-              ><v-btn text color="primary" @click="$emit('input', null)">{{
-                $ay.t("Delete")
-              }}</v-btn>
-              <v-spacer></v-spacer>
-              <v-btn text color="primary" @click="setNow()">{{
-                $ay.t("Now")
-              }}</v-btn>
-              <v-spacer></v-spacer>
-              <v-btn text color="primary" @click="dlgtime = false">{{
-                $ay.t("OK")
-              }}</v-btn>
-            </v-time-picker>
-          </v-dialog>
-        </v-col>
+              @change="updateTimeValue"
+              :readonly="readonly"
+              :disabled="disabled"
+              type="time"
+              :data-cy="'timeinput:' + testId"
+            ></v-text-field>
+          </v-col>
+        </template>
       </template>
       <template v-else>
         <v-col cols="12">