diff --git a/app.py b/app.py
index 9da0d8a..6ca4698 100644
--- a/app.py
+++ b/app.py
@@ -25,7 +25,7 @@ app.register_blueprint(auth_blueprint)
 
 class Period(db.Model):
     period = db.Column(db.Integer, primary_key=True)
-    periodTime = db.Column(db.Integer)
+    periodTime = db.Column(db.Time)
     weekendSchedule = db.Column(db.Boolean)
 
     def __repr__(self):
@@ -90,7 +90,7 @@ def editPeriod(periodNum):
     period = Period.query.get_or_404(periodNum)
     form = PeriodForm(obj=period)
     if form.validate_on_submit():
-        period.periodTime = str(form.periodTime.data)
+        period.periodTime = form.periodTime.data
         period.weekendSchedule = form.weekendSchedule.data
         db.session.commit()
         return redirect(f'/period/edit/{periodNum}')
@@ -107,7 +107,7 @@ def delete_period(periodNum):
 def newPeriod():
     form = PeriodForm()
     if form.validate_on_submit():
-        period = Period(periodTime=str(form.periodTime.data),
+        period = Period(periodTime=form.periodTime.data,
                          weekendSchedule=form.weekendSchedule.data
         )
         print(period.periodTime)
diff --git a/templates/editEvent.html b/templates/editEvent.html
index bbcf550..cb48cb5 100644
--- a/templates/editEvent.html
+++ b/templates/editEvent.html
@@ -2,9 +2,8 @@
 
 {% block content %}
 <span><h1>{% block title %} Edit Event {% endblock %}</h1></span>
-    {% set convertedTime = datetime.strptime(event.period.periodTime, "%H:%M:%S") %}
     <p>
-        <b>Period {{ event.period.period }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }}
+        <b>Period {{ event.period.period }}</b> <br> Time: {{ event.period.periodTime.strftime("%I:%M %p") }}
     </p>
     {% if event.task_id != None %}
     <p>
diff --git a/templates/editPeriod.html b/templates/editPeriod.html
index 044839f..0714838 100644
--- a/templates/editPeriod.html
+++ b/templates/editPeriod.html
@@ -10,7 +10,7 @@
     {{ form.csrf_token }}
     <p>
         {{ form.periodTime.label }}
-        {{ form.periodTime(value=period.periodTime) }}
+        {{ form.periodTime }}
     </p>
     <p>
         {{ form.weekendSchedule.label }}
diff --git a/templates/events.html b/templates/events.html
index 6f14044..b4b1c0d 100644
--- a/templates/events.html
+++ b/templates/events.html
@@ -8,8 +8,7 @@
     <div>
         {% for period in periods %}
             <div>
-                {% set convertedTime = datetime.strptime(period.periodTime, "%H:%M:%S") %}
-                <p><b>Period {{ period.period }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }} </p>
+                <p><b>Period {{ period.period }}</b> <br> Time: {{ period.periodTime.strftime("%I:%M %p") }} </p>
                 {% for event in events if event.scheduled_date == currDay and event.period == period %}
                 <div class="float-right"><a type="button" class="btn btn-primary" href="/event/edit/{{ event.id }}">Edit</a></div>
                 {% if event.task_id != None %}
diff --git a/templates/periods.html b/templates/periods.html
index 8c1044a..f2e206c 100644
--- a/templates/periods.html
+++ b/templates/periods.html
@@ -4,7 +4,6 @@
     <span><h1>{% block title %} Periods {% endblock %}</h1></span> <a class="btn btn-primary" href="/period/new" role="button">New Period </a> <br> <br>
     <div>
         {% for period in periods %}
-        {% set convertedTime = datetime.strptime(period.periodTime, "%H:%M:%S") %}
         <div class="float-right">
         <form method="post"
             action="{{url_for('delete_period',
@@ -15,7 +14,7 @@
         <div class="float-right"><a type="button" class="btn btn-primary mr-1" href="/period/edit/{{ period.period }}">Edit</a>
         </div>
         <div>
-            <p><b>Period {{ period.period }}</b> <br> Time: {{ convertedTime.strftime("%I:%M %p") }} </p>
+            <p><b>Period {{ period.period }}</b> <br> Time: {{ period.periodTime.strftime("%I:%M %p") }} </p>
         </div>
         <hr>
         {% endfor %}