diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aab76a94..c6d681d0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,6 +17,7 @@ set (timew_SRCS AtomicFile.cpp AtomicFile.h
                 Interval.cpp   Interval.h
                 IntervalFactory.cpp IntervalFactory.h
                 IntervalFilter.cpp IntervalFilter.h
+                IntervalFilterAllInRange.cpp IntervalFilterAllInRange.h
                 IntervalFilterAllWithTags.cpp IntervalFilterAllWithTags.h
                 Journal.cpp    Journal.h
                 Range.cpp      Range.h
diff --git a/src/IntervalFilterAllInRange.cpp b/src/IntervalFilterAllInRange.cpp
new file mode 100644
index 00000000..8853e9c1
--- /dev/null
+++ b/src/IntervalFilterAllInRange.cpp
@@ -0,0 +1,50 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// https://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <IntervalFilterAllInRange.h>
+
+IntervalFilterAllInRange::IntervalFilterAllInRange (const Range& range): _range (range)
+{}
+
+bool IntervalFilterAllInRange::accepts (const Interval& interval)
+{
+  if (is_done())
+  {
+    return false;
+  }
+
+  if ((!_range.is_started() && !_range.is_ended()) || interval.intersects (_range))
+  {
+    return true;
+  }
+
+  // Since we are moving backwards in time, and the intervals are in sorted order,
+  // if the filter is after the interval and does not intersect,
+  // we know there will be no more matches
+  set_done (interval.start < _range.start);
+
+  return false;
+}
diff --git a/src/IntervalFilterAllInRange.h b/src/IntervalFilterAllInRange.h
new file mode 100644
index 00000000..02843ae8
--- /dev/null
+++ b/src/IntervalFilterAllInRange.h
@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// https://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDED_INTERVALFILTEALLINRRANGE
+#define INCLUDED_INTERVALFILTEALLINRRANGE
+
+#include <IntervalFilter.h>
+#include <Range.h>
+
+class IntervalFilterAllInRange : public IntervalFilter
+{
+public:
+  explicit IntervalFilterAllInRange (const Range&);
+
+  bool accepts (const Interval&) final;
+
+private:
+  const Range& _range;
+};
+
+#endif //INCLUDED_INTERVALFILTERRANGE