diff -r f049c3d3244d -r b997cbf9e30b c++/rgb-assembler/rgb-assembler.cpp
--- a/c++/rgb-assembler/rgb-assembler.cpp	Sun Dec 24 00:47:34 2017 +0100
+++ b/c++/rgb-assembler/rgb-assembler.cpp	Mon Dec 25 00:24:07 2017 +0100
@@ -40,41 +40,40 @@
 
 	setlocale(LC_ALL, "");
 
-	// TODO: wrap in a class with read(), write() and setAddress() methods
-	octet_t * memory = (octet_t*) malloc(MEMORY_SIZE);
-
+	Memory memory;
+	
 	// Sample program / data:
 	// TODO: load bytes from file, stdin, serial port, network…
 	{
-		address_t a = 0;
-		write<command_t>(memory, a, CMD_SLEEP);
-		write<sleep_t>(memory, a, 255);
-		write<command_t>(memory, a, CMD_SLEEP);
-		write<sleep_t>(memory, a, 10);
-		write<command_t>(memory, a, CMD_SLEEP);
-		write<sleep_t>(memory, a, 255);
-		write<command_t>(memory, a, CMD_GOTO);
-		write<address_t>(memory, a, a + sizeof (address_t) + 2 * sizeof (command_t));
-		write<command_t>(memory, a, CMD_INVALID);
-		write<command_t>(memory, a, CMD_INVALID);
-		write<command_t>(memory, a, CMD_SLEEP);
-		write<sleep_t>(memory, a, 255);
-		write<command_t>(memory, a, CMD_COLOR);
-		write<led_t>(memory, a, 23);
-		write<color_t>(memory, a, 0);
-		write<color_t>(memory, a, 200);
-		write<color_t>(memory, a, 255);
-		write<command_t>(memory, a, CMD_INCREMENT);
-		write<address_t>(memory, a, 0);
-		write<command_t>(memory, a, CMD_DECREMENT);
-		write<address_t>(memory, a, 0);
-		write<command_t>(memory, a, CMD_GOTO_COMPARE);
-		write<address_t>(memory, a, 0);
-		write<address_t>(memory, a, 0 + sizeof (command_t) + sizeof (sleep_t));
-		write<address_t>(memory, a, a - 3 * sizeof (address_t) - 2 * sizeof (command_t));
-		write<address_t>(memory, a, 0);
-		write<address_t>(memory, a, a + sizeof (address_t));
-		write<command_t>(memory, a, CMD_END);
+		memory.write<command_t>(CMD_SLEEP);
+		memory.write<sleep_t>(255);
+		memory.write<command_t>(CMD_SLEEP);
+		memory.write<sleep_t>(10);
+		memory.write<command_t>(CMD_SLEEP);
+		memory.write<sleep_t>(255);
+		memory.write<command_t>(CMD_GOTO);
+		memory.write<address_t>(memory.getIndex() + sizeof (address_t) + 2 * sizeof (command_t));
+		memory.write<command_t>(CMD_INVALID);
+		memory.write<command_t>(CMD_INVALID);
+		memory.write<command_t>(CMD_SLEEP);
+		memory.write<sleep_t>(255);
+		memory.write<command_t>(CMD_COLOR);
+		memory.write<led_t>(23);
+		memory.write<color_t>(0);
+		memory.write<color_t>(200);
+		memory.write<color_t>(255);
+		memory.write<command_t>(CMD_INCREMENT);
+		memory.write<address_t>(0);
+		memory.write<command_t>(CMD_DECREMENT);
+		memory.write<address_t>(0);
+		memory.write<command_t>(CMD_GOTO_COMPARE);
+		memory.write<address_t>(0);
+		memory.write<address_t>(0 + sizeof (command_t) + sizeof (sleep_t));
+		memory.write<address_t>(memory.getIndex() - 3 * sizeof (address_t) - 2 * sizeof (command_t));
+		memory.write<address_t>(0);
+		memory.write<address_t>(memory.getIndex() + sizeof (address_t));
+		memory.write<command_t>(CMD_END);
+		memory.start();
 	}
 
 	// Supported commands
@@ -91,22 +90,20 @@
 
 
 	// Main loop / interpreter:
-	for (address_t i = 0; i < MEMORY_SIZE;) {
-		wprintf(L"command %*d = ", 4, i);
-		command_t commandCode = read<command_t>(memory, i);
+	while (memory.isInside()) {
+		wprintf(L"command %*d = ", 4, memory.getIndex());
+		command_t commandCode = memory.read<command_t>();
 		wprintf(L"%02X  ", commandCode);
 
 		shared_ptr<Command> command = commands[commandCode];
 
 		if (command) {
-			command->process(memory, i);
+			command->process(memory);
 		} else {
 			wprintf(L"invalid command\n");
 		}
 	}
 
-	free(memory);
-	memory = nullptr;
 	wprintf(L"all done\n");
 	return 0;
 }