diff -r f049c3d3244d -r b997cbf9e30b c++/rgb-assembler/commands/Goto.h
--- a/c++/rgb-assembler/commands/Goto.h	Sun Dec 24 00:47:34 2017 +0100
+++ b/c++/rgb-assembler/commands/Goto.h	Mon Dec 25 00:24:07 2017 +0100
@@ -27,12 +27,11 @@
 class Goto : public Command {
 public:
 
-	void process(octet_t* memory, address_t& index) override {
-		index = read<address_t>(memory, index);
+	void process(Memory &memory) override {
+		address_t index = memory.read<address_t>();
+		memory.setIndex(index);
 		wprintf(L"GOTO %*d\n", 5, index);
 	}
-private:
-
 };
 
 }