diff --git a/src/Commands/SelNextVertexCmd.cpp b/src/Commands/SelNextVertexCmd.cpp
index bbd55fe..8d89dbd 100644
--- a/src/Commands/SelNextVertexCmd.cpp
+++ b/src/Commands/SelNextVertexCmd.cpp
@@ -3,17 +3,17 @@
 namespace ofx {
 namespace piMapper {
 
-SelNextVertexCmd::SelNextVertexCmd(BaseSurface * s){
-	_surface = s;
+SelNextVertexCmd::SelNextVertexCmd(SurfaceManager * sm){
+	_surfaceManager = sm;
 }
 
 void SelNextVertexCmd::exec(){
-
+	_surfaceManager->selectNextVertex();
 }
 
 void SelNextVertexCmd::undo(){
 	ofLogNotice("SelNextVertexCmd", "undo");
-	
+	_surfaceManager->selectPrevVertex();
 }
 
 } // namespace piMapper
diff --git a/src/Commands/SelNextVertexCmd.h b/src/Commands/SelNextVertexCmd.h
index ad83c89..f8c636b 100644
--- a/src/Commands/SelNextVertexCmd.h
+++ b/src/Commands/SelNextVertexCmd.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "BaseCmd.h"
-#include "BaseSurface.h"
+#include "SurfaceManager.h"
 
 class ofxPiMapper;
 
@@ -11,12 +11,12 @@ namespace piMapper {
 class SelNextVertexCmd : public BaseUndoCmd {
 
 	public:
-		SelNextVertexCmd(BaseSurface * s);
+		SelNextVertexCmd(SurfaceManager * sm);
 		void exec();
 		void undo();
 
 	private:
-		BaseSurface * _surface;
+		SurfaceManager * _surfaceManager;
 
 };