diff --git a/TODO.org b/TODO.org
index cc57e6b..a88d4f4 100644
--- a/TODO.org
+++ b/TODO.org
@@ -1,5 +1,7 @@
 #+TITLE: Todo List
 * Inbox
+** TODO Make sure the video gets changed in a proper manner to not have left over video showing from previous items
+[[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::currentServiceItem++;]]
 ** TODO Fix possible bug in arrangingItems in draghandler
 [[file:~/dev/church-presenter/src/qml/presenter/DragHandle.qml::function arrangeItem() {]]
 ** TODO [#A] Make Presentation Window follow the presenter component
@@ -14,12 +16,11 @@
 ** TODO Find a way to maths the textsize
 [[file:~/dev/church-presenter/src/qml/presenter/Slide.qml::property real textSize: 50]]
 
-** TODO Make nextSlideText a nextAction function to incorporate other types of items
-[[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::function nextSlideText() {]]
-
 ** TODO Create a nextslide function to be used after the end of the list of slides
 [[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::function nextSlide() {]]
 
+- [ ] Check to make sure this works in all conditions but I believe it works ok.
+
 ** TODO Fix broken append when importing River song
 [[file:~/dev/church-presenter/src/qml/presenter/LeftDock.qml::function appendItem(name, type, background, backgroundType, text, itemID) {]]
 
@@ -30,6 +31,9 @@
 ** DONE Parse Lyrics to create a list of strings for slides
 SCHEDULED: <2022-03-23 Wed 10:00>
 
+** DONE Make nextSlideText a nextAction function to incorporate other types of items
+[[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::function nextSlideText() {]]
+
 ** DONE Fix file dialog using basic QT theme
 [[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::FileDialog {]]
 
diff --git a/src/qml/presenter/LeftDock.qml b/src/qml/presenter/LeftDock.qml
index 9dfbdad..047a0b7 100644
--- a/src/qml/presenter/LeftDock.qml
+++ b/src/qml/presenter/LeftDock.qml
@@ -116,6 +116,7 @@ ColumnLayout {
                         }
                         onClicked: {
                             serviceItemList.currentIndex = index;
+                            currentServiceItem = index;
                             changeServiceItem(index);
                         }
                         onRightClicked: rightClickMenu.popup()
diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml
index 4389edb..994423e 100644
--- a/src/qml/presenter/MainWindow.qml
+++ b/src/qml/presenter/MainWindow.qml
@@ -12,6 +12,7 @@ Controls.Page {
     padding: 0
 
     // properties passed around for the slides
+    property int currentServiceItem
     property url imageBackground: ""
     property url videoBackground: ""
     property int blurRadius: 0
diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml
index 8378f8e..fc25ef4 100644
--- a/src/qml/presenter/Presentation.qml
+++ b/src/qml/presenter/Presentation.qml
@@ -135,6 +135,7 @@ Item {
             } else {
                 print("Next slide time");
                 textIndex = 0;
+                previewSlide.text = "";
                 nextSlide();
             }
         } else if (itemType === "video")
@@ -144,6 +145,8 @@ Item {
     }
 
     function nextSlide() {
+        currentServiceItem++;
+        changeServiceItem(currentServiceItem);
         print(slideItem);
     }
 }