diff --git a/src/Datafile.cpp b/src/Datafile.cpp
index 9745961c..3d3b880a 100644
--- a/src/Datafile.cpp
+++ b/src/Datafile.cpp
@@ -53,9 +53,15 @@ std::string Datafile::name () const
 ////////////////////////////////////////////////////////////////////////////////
 Interval Datafile::getLatestInterval ()
 {
+  // Load data
+  if (! _intervals_loaded)
+    load_intervals ();
+
+  // Return the last element in _lines.
+  if (_intervals.size ())
+    return _intervals.back ();
+
   return Interval ();
-  // TODO Load data
-  // TODO Return the last element in _lines.
 }
 
 ////////////////////////////////////////////////////////////////////////////////