diff --git a/DRAMSys/library/library.pro b/DRAMSys/library/library.pro
index c4cef29a..79168bbe 100644
--- a/DRAMSys/library/library.pro
+++ b/DRAMSys/library/library.pro
@@ -125,7 +125,8 @@ SOURCES += \
     src/controller/scheduler/Fr_Fcfs_read_priority.cpp \
     src/controller/scheduler/Fr_Fcfs_grouper.cpp \
     src/common/AddressDecoder.cpp \
-    src/common/jsonAddressDecoder.cpp
+    src/common/jsonAddressDecoder.cpp \
+    src/controller/scheduler/Fifo_grouper.cpp
 
 HEADERS += \
     src/common/third_party/tinyxml2/tinyxml2.h \
diff --git a/DRAMSys/library/src/controller/scheduler/Fifo_grouper.cpp b/DRAMSys/library/src/controller/scheduler/Fifo_grouper.cpp
new file mode 100644
index 00000000..fe041319
--- /dev/null
+++ b/DRAMSys/library/src/controller/scheduler/Fifo_grouper.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2015, University of Kaiserslautern
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors:
+ *    Robert Gernhardt
+ *    Matthias Jung
+ */
+
+#include "Fifo.h"
+
+using namespace std;
+
+void Fifo::schedule(gp *payload)
+{
+    buffer[DramExtension::getExtension(payload).getBank()].emplace_back(payload);
+}
+
+pair<Command, tlm::tlm_generic_payload *> Fifo::getNextRequest(Bank bank)
+{
+    if (!buffer[bank].empty()) {
+        gp *payload = buffer[bank].front();
+        Command command = IScheduler::getNextCommand(*payload);
+        if (command == Command::Read || command == Command::ReadA
+                || command == Command::Write || command == Command::WriteA) {
+            buffer[bank].pop_front();
+        }
+
+        return pair<Command, tlm::tlm_generic_payload *>(command, payload);
+    }
+
+    return pair<Command, tlm::tlm_generic_payload *>(Command::NOP, NULL);
+}
+
+gp *Fifo::getPendingRequest(Bank /*bank*/)
+{
+    return NULL;
+}
+
+