diff --git a/src/base/base_core.c b/src/base/base_core.c
index cd22d9f1..09f9f749 100644
--- a/src/base/base_core.c
+++ b/src/base/base_core.c
@@ -514,6 +514,59 @@ date_time_from_micro_seconds(U64 time){
   return(result);
 }
 
+internal DateTime
+date_time_from_unix_time(U64 unix_time)
+{
+  DateTime date = {0};
+  date.year     = 1970;
+  date.day      = 1 + (unix_time / 86400);
+  date.sec      = (U32)unix_time % 60;
+  date.min      = (U32)(unix_time / 60) % 60;
+  date.hour     = (U32)(unix_time / 3600) % 24;
+
+  for(;;)
+  {
+    for(date.month = 0; date.month <= 12; ++date.month)
+    {
+      U64 c = 0;
+      switch(date.month)
+      {
+        case Month_Jan: c = 31; break;
+        case Month_Feb:
+        {
+          if((date.year % 4 == 0) && ((date.year % 100) != 0 || (date.year % 400) == 0))
+          {
+            c = 29;
+          }
+          else
+          {
+            c = 28;
+          }
+        } break;
+        case Month_Mar: c = 31; break;
+        case Month_Apr: c = 30; break;
+        case Month_May: c = 31; break;
+        case Month_Jun: c = 30; break;
+        case Month_Jul: c = 31; break;
+        case Month_Aug: c = 31; break;
+        case Month_Sep: c = 30; break;
+        case Month_Oct: c = 31; break;
+        case Month_Nov: c = 30; break;
+        case Month_Dec: c = 31; break;
+      }
+      if(date.day <= c)
+      {
+        goto exit;
+      }
+      date.day -= c;
+    }
+    ++date.year;
+  }
+  exit:;
+
+  return date;
+}
+
 ////////////////////////////////
 //~ rjf: Non-Fancy Ring Buffer Reads/Writes
 
diff --git a/src/base/base_core.h b/src/base/base_core.h
index b871be76..688076f0 100644
--- a/src/base/base_core.h
+++ b/src/base/base_core.h
@@ -821,8 +821,9 @@ internal Compiler compiler_from_context(void);
 //~ rjf: Time Functions
 
 internal DenseTime dense_time_from_date_time(DateTime date_time);
-internal DateTime date_time_from_dense_time(DenseTime time);
-internal DateTime date_time_from_micro_seconds(U64 time);
+internal DateTime  date_time_from_dense_time(DenseTime time);
+internal DateTime  date_time_from_micro_seconds(U64 time);
+internal DateTime  date_time_from_unix_time(U64 unix_time);
 
 ////////////////////////////////
 //~ rjf: Non-Fancy Ring Buffer Reads/Writes