diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp b/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp
index 1a12a975f..dfd4ae105 100644
--- a/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp
+++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp
@@ -275,6 +275,8 @@ void CaptureDialog::on_exePathBrowse_clicked()
       file = m_Ctx->Config.LastCaptureExe;
   }
 
+  // TODO Remote
+
   // if(m_Core.Renderer.Remote == null)
   {
     QString filename = RDDialog::getOpenFileName(this, tr("Choose executable"), initDir,
@@ -311,6 +313,8 @@ void CaptureDialog::on_workDirBrowse_clicked()
       initDir = m_Ctx->Config.LastCapturePath;
   }
 
+  // TODO Remote
+
   // if(m_Core.Renderer.Remote == null)
   {
     QString dir = RDDialog::getExistingDirectory(this, "Choose working directory", initDir);
@@ -577,6 +581,8 @@ void CaptureDialog::triggerCapture()
   {
     QString exe = ui->exePath->text();
 
+    // TODO Remote
+
     // for non-remote captures, check the executable locally
     // if(m_Core.Renderer.Remote == null)
     {
@@ -590,6 +596,8 @@ void CaptureDialog::triggerCapture()
 
     QString workingDir = "";
 
+    // TODO Remote
+
     // for non-remote captures, check the directory locally
     // if(m_Core.Renderer.Remote == null)
     {
diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp
index 89f19406a..a5647a529 100644
--- a/qrenderdoc/Windows/MainWindow.cpp
+++ b/qrenderdoc/Windows/MainWindow.cpp
@@ -304,6 +304,8 @@ void MainWindow::LoadLogfile(const QString &filename, bool temporary, bool local
     rdctype::str machineIdent;
     ReplaySupport support = eReplaySupport_Unsupported;
 
+    // TODO Remote
+
     bool remoteReplay =
         !local /*|| (m_Core.Renderer.Remote != null && m_Core.Renderer.Remote.Connected)*/;
 
@@ -427,6 +429,8 @@ void MainWindow::LoadLogfile(const QString &filename, bool temporary, bool local
       {
         RDDialog::critical(NULL, tr("Not Implemented"), tr("Not Implemented"));
         return;
+
+        // TODO Remote
         /*
         try
         {
@@ -781,6 +785,7 @@ void MainWindow::OnLogfileLoaded()
 
 void MainWindow::OnLogfileClosed()
 {
+  // TODO Remote
   // contextChooser.Enabled = true;
 
   statusText->setText("");
@@ -821,6 +826,7 @@ void MainWindow::on_action_About_triggered()
 
 void MainWindow::on_action_Mesh_Output_triggered()
 {
+  // TODO Mesh view
 }
 
 void MainWindow::on_action_Event_Viewer_triggered()