diff --git a/src/codeu/chat/client/View.java b/src/codeu/chat/client/View.java
index c32aa0c32..eb6d1ee63 100644
--- a/src/codeu/chat/client/View.java
+++ b/src/codeu/chat/client/View.java
@@ -23,10 +23,10 @@
 import codeu.chat.common.LogicalView;
 import codeu.chat.common.Message;
 import codeu.chat.common.NetworkCode;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
 import codeu.chat.util.Logger;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 import codeu.chat.util.connections.Connection;
 import codeu.chat.util.connections.ConnectionSource;
diff --git a/src/codeu/chat/common/Conversation.java b/src/codeu/chat/common/Conversation.java
index 05776e7d0..a346d0583 100644
--- a/src/codeu/chat/common/Conversation.java
+++ b/src/codeu/chat/common/Conversation.java
@@ -22,6 +22,7 @@
 
 import codeu.chat.util.Serializer;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 
 public final class Conversation {
diff --git a/src/codeu/chat/common/ConversationSummary.java b/src/codeu/chat/common/ConversationSummary.java
index 1b08b5a2f..e32125f25 100644
--- a/src/codeu/chat/common/ConversationSummary.java
+++ b/src/codeu/chat/common/ConversationSummary.java
@@ -20,6 +20,7 @@
 
 import codeu.chat.util.Serializer;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 
 public final class ConversationSummary implements ListViewable {
diff --git a/src/codeu/chat/common/LogicalView.java b/src/codeu/chat/common/LogicalView.java
index 82d6288bb..5f859e31a 100644
--- a/src/codeu/chat/common/LogicalView.java
+++ b/src/codeu/chat/common/LogicalView.java
@@ -16,6 +16,7 @@
 
 import java.util.Collection;
 
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 
 // LOGICAL VIEW
diff --git a/src/codeu/chat/common/Message.java b/src/codeu/chat/common/Message.java
index 1698bdf51..46052d57e 100644
--- a/src/codeu/chat/common/Message.java
+++ b/src/codeu/chat/common/Message.java
@@ -20,6 +20,7 @@
 
 import codeu.chat.util.Serializer;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 
 public final class Message {
diff --git a/src/codeu/chat/common/RawController.java b/src/codeu/chat/common/RawController.java
index b83a39963..83f251f6e 100644
--- a/src/codeu/chat/common/RawController.java
+++ b/src/codeu/chat/common/RawController.java
@@ -14,6 +14,7 @@
 
 package codeu.chat.common;
 
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 
 // RAW CONTROLLER
diff --git a/src/codeu/chat/common/Relay.java b/src/codeu/chat/common/Relay.java
index 0d7b7ad0e..b3a24de14 100644
--- a/src/codeu/chat/common/Relay.java
+++ b/src/codeu/chat/common/Relay.java
@@ -16,7 +16,7 @@
 
 import java.util.Collection;
 
-import codeu.chat.common.Time;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 
 // RELAY
diff --git a/src/codeu/chat/common/User.java b/src/codeu/chat/common/User.java
index 97b4e2fd9..4981d8028 100644
--- a/src/codeu/chat/common/User.java
+++ b/src/codeu/chat/common/User.java
@@ -20,6 +20,7 @@
 
 import codeu.chat.util.Serializer;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 
 public final class User {
diff --git a/src/codeu/chat/relay/Server.java b/src/codeu/chat/relay/Server.java
index d5f625412..9a283810e 100644
--- a/src/codeu/chat/relay/Server.java
+++ b/src/codeu/chat/relay/Server.java
@@ -24,7 +24,8 @@
 
 import codeu.chat.common.LinearUuidGenerator;
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
+import codeu.chat.util.Logger;
+import codeu.chat.util.Time;
 import codeu.chat.util.Logger;
 import codeu.chat.util.Uuid;
 
diff --git a/src/codeu/chat/relay/ServerFrontEnd.java b/src/codeu/chat/relay/ServerFrontEnd.java
index 9d2f03fa0..0cd8a804c 100644
--- a/src/codeu/chat/relay/ServerFrontEnd.java
+++ b/src/codeu/chat/relay/ServerFrontEnd.java
@@ -21,10 +21,10 @@
 
 import codeu.chat.common.NetworkCode;
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
 import codeu.chat.util.Logger;
 import codeu.chat.util.Serializer;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 import codeu.chat.util.connections.Connection;
 
diff --git a/src/codeu/chat/server/Controller.java b/src/codeu/chat/server/Controller.java
index e3223d61c..cbc2589a2 100644
--- a/src/codeu/chat/server/Controller.java
+++ b/src/codeu/chat/server/Controller.java
@@ -20,9 +20,9 @@
 import codeu.chat.common.Conversation;
 import codeu.chat.common.Message;
 import codeu.chat.common.RawController;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
 import codeu.chat.util.Logger;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 
 public final class Controller implements RawController, BasicController {
diff --git a/src/codeu/chat/server/Model.java b/src/codeu/chat/server/Model.java
index 643b2cdb8..f5e5142be 100644
--- a/src/codeu/chat/server/Model.java
+++ b/src/codeu/chat/server/Model.java
@@ -20,11 +20,11 @@
 import codeu.chat.common.ConversationSummary;
 import codeu.chat.common.LinearUuidGenerator;
 import codeu.chat.common.Message;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
+import codeu.chat.util.Time;
+import codeu.chat.util.Uuid;
 import codeu.chat.util.store.Store;
 import codeu.chat.util.store.StoreAccessor;
-import codeu.chat.util.Uuid;
 
 public final class Model {
 
diff --git a/src/codeu/chat/server/NoOpRelay.java b/src/codeu/chat/server/NoOpRelay.java
index 3bb601d82..6b68975c5 100644
--- a/src/codeu/chat/server/NoOpRelay.java
+++ b/src/codeu/chat/server/NoOpRelay.java
@@ -18,10 +18,9 @@
 import java.util.Collection;
 
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 
-
 // NO OP RELAY
 //
 // The no op relay is an empty implementation of the relay interface
diff --git a/src/codeu/chat/server/RemoteRelay.java b/src/codeu/chat/server/RemoteRelay.java
index 850a02749..9fc7cdcb7 100644
--- a/src/codeu/chat/server/RemoteRelay.java
+++ b/src/codeu/chat/server/RemoteRelay.java
@@ -22,10 +22,10 @@
 
 import codeu.chat.common.NetworkCode;
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
 import codeu.chat.util.Logger;
 import codeu.chat.util.Serializer;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 import codeu.chat.util.connections.Connection;
 import codeu.chat.util.connections.ConnectionSource;
diff --git a/src/codeu/chat/server/Server.java b/src/codeu/chat/server/Server.java
index 4ba95ff38..f392cefbf 100644
--- a/src/codeu/chat/server/Server.java
+++ b/src/codeu/chat/server/Server.java
@@ -29,10 +29,10 @@
 import codeu.chat.common.Message;
 import codeu.chat.common.NetworkCode;
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
 import codeu.chat.util.Logger;
 import codeu.chat.util.Serializers;
+import codeu.chat.util.Time;
 import codeu.chat.util.Timeline;
 import codeu.chat.util.Uuid;
 import codeu.chat.util.connections.Connection;
diff --git a/src/codeu/chat/server/View.java b/src/codeu/chat/server/View.java
index 3939ba361..37df663f9 100644
--- a/src/codeu/chat/server/View.java
+++ b/src/codeu/chat/server/View.java
@@ -33,9 +33,9 @@
 import codeu.chat.common.LogicalView;
 import codeu.chat.common.Message;
 import codeu.chat.common.SinglesView;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
 import codeu.chat.util.Logger;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 import codeu.chat.util.store.StoreAccessor;
 
diff --git a/src/codeu/chat/common/Time.java b/src/codeu/chat/util/Time.java
similarity index 77%
rename from src/codeu/chat/common/Time.java
rename to src/codeu/chat/util/Time.java
index 551fa3c61..64481ea2f 100644
--- a/src/codeu/chat/common/Time.java
+++ b/src/codeu/chat/util/Time.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package codeu.chat.common;
+package codeu.chat.util;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -20,9 +20,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import codeu.chat.util.Serializer;
-import codeu.chat.util.Serializers;
-
 public final class Time implements Comparable<Time> {
 
   public static final Serializer<Time> SERIALIZER = new Serializer<Time>() {
@@ -30,7 +27,7 @@ public final class Time implements Comparable<Time> {
     @Override
     public void write(OutputStream out, Time value) throws IOException {
 
-      Serializers.LONG.write(out, value.totalMs);
+      Serializers.LONG.write(out, value.inMs());
 
     }
 
@@ -45,24 +42,24 @@ public Time read(InputStream in) throws IOException {
   private static final SimpleDateFormat formatter =
       new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss.SSS");
 
-  private final long totalMs;
+  private final Date date;
 
-  private Time(long totalMs) { this.totalMs = totalMs; }
+  private Time(long totalMs) { this.date = new Date(totalMs); }
 
-  public long inMs() { return totalMs; }
+  public long inMs() { return date.getTime(); }
 
   @Override
   public int compareTo(Time other) {
-    return Long.compare(totalMs, other.totalMs);
+    return date.compareTo(other.date);
   }
 
   public boolean inRange(Time start, Time end) {
-    return totalMs >= start.totalMs && totalMs <= end.totalMs;
+    return this.compareTo(start) >= 0 && this.compareTo(end) <= 0;
   }
 
   @Override
   public String toString() {
-    return formatter.format(new Date(totalMs));
+    return formatter.format(date);
   }
 
   public static Time fromMs(long ms) { return new Time(ms); }
diff --git a/test/codeu/chat/TestRunner.java b/test/codeu/chat/TestRunner.java
index 59f954c35..7cf59b237 100644
--- a/test/codeu/chat/TestRunner.java
+++ b/test/codeu/chat/TestRunner.java
@@ -26,6 +26,7 @@ public static void main(String[] args) {
              codeu.chat.relay.ServerTest.class,
              codeu.chat.server.BasicControllerTest.class,
              codeu.chat.server.RawControllerTest.class,
+             codeu.chat.util.TimeTest.class,
              codeu.chat.util.UuidTest.class,
              codeu.chat.util.store.StoreTest.class
          );
diff --git a/test/codeu/chat/relay/ServerTest.java b/test/codeu/chat/relay/ServerTest.java
index 7c248479a..34b57b073 100644
--- a/test/codeu/chat/relay/ServerTest.java
+++ b/test/codeu/chat/relay/ServerTest.java
@@ -21,7 +21,7 @@
 import org.junit.Before;
 
 import codeu.chat.common.Relay;
-import codeu.chat.common.Time;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 
 public final class ServerTest {
diff --git a/test/codeu/chat/server/RawControllerTest.java b/test/codeu/chat/server/RawControllerTest.java
index 5cd1e7ae9..30382a650 100644
--- a/test/codeu/chat/server/RawControllerTest.java
+++ b/test/codeu/chat/server/RawControllerTest.java
@@ -21,8 +21,8 @@
 import codeu.chat.common.Conversation;
 import codeu.chat.common.Message;
 import codeu.chat.common.RawController;
-import codeu.chat.common.Time;
 import codeu.chat.common.User;
+import codeu.chat.util.Time;
 import codeu.chat.util.Uuid;
 
 public final class RawControllerTest {
diff --git a/test/codeu/chat/util/TimeTest.java b/test/codeu/chat/util/TimeTest.java
new file mode 100644
index 000000000..1b93b13bc
--- /dev/null
+++ b/test/codeu/chat/util/TimeTest.java
@@ -0,0 +1,28 @@
+// Copyright 2017 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package codeu.chat.util;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.Before;
+
+public final class TimeTest {
+
+  @Test
+  public void testFromMs() {
+    assertEquals(0, Time.fromMs(0).inMs());
+    assertEquals(10, Time.fromMs(10).inMs());
+  }
+}