diff --git a/src/hacks/Walkbot.cpp b/src/hacks/Walkbot.cpp
index af451ffd..8c7794a5 100644
--- a/src/hacks/Walkbot.cpp
+++ b/src/hacks/Walkbot.cpp
@@ -9,7 +9,10 @@
 
 namespace hacks { namespace shared { namespace walkbot {
 
-constexpr unsigned INVALID_NODE = unsigned(-1);
+using index_t = unsigned;
+
+constexpr index_t INVALID_NODE = unsigned(-1);
+constexpr size_t MAX_CONNECTIONS = 4;
 
 enum ENodeFlags {
 	NF_GOOD = (1 << 0),
@@ -17,21 +20,6 @@ enum ENodeFlags {
 	NF_JUMP = (1 << 2)
 };
 
-struct walkbot_header_s {
-	unsigned version { 1 };
-	unsigned node_count { 0 };
-	unsigned first_node { 0 };
-};
-
-struct walkbot_node_s {
-	float x { 0.0f }; // 4
-	float y { 0.0f }; // 8
-	float z { 0.0f }; // 12
-	unsigned flags { 0 }; // 16
-	unsigned prev { 0 }; // 20
-	unsigned next { 0 }; // 24
-}; // 24
-
 enum EWalkbotState {
 	WB_DISABLED,
 	WB_RECORDING,
@@ -39,18 +27,124 @@ enum EWalkbotState {
 	WB_REPLAYING
 };
 
+struct walkbot_header_s {
+	unsigned version { 1 };
+	unsigned node_count { 0 };
+};
+
+struct walkbot_node_s {
+	union {
+		struct {
+			float x { 0.0f }; // 4
+			float y { 0.0f }; // 8
+			float z { 0.0f }; // 12
+		};
+		Vector xyz { 0, 0, 0 };
+	};
+	unsigned flags { 0 }; // 16
+	size_t connection_count { 0 }; // 20
+	index_t connections[MAX_CONNECTIONS]; // 36
+}; // 36
+
+namespace state {
+
+// A vector containing all loaded nodes, used in both recording and replaying
+std::vector<walkbot_node_s> nodes {};
+
+// Target node when replaying, selected node when editing, last node when recording
+index_t active_node { INVALID_NODE };
+
+// Node closest to your crosshair when editing
+index_t closest_node { INVALID_NODE };
+
+// Global state
 EWalkbotState state { WB_DISABLED };
 
+bool node_good(index_t node) {
+	return node < nodes.size() && (nodes[node].flags & NF_GOOD);
+}
+
+}
+
 CatVar pause_recording(CV_SWITCH, "wb_recording_paused", "0", "Pause recording", "Use BindToggle with this");
 CatVar draw_info(CV_SWITCH, "wb_info", "1", "Walkbot info");
 CatVar draw_path(CV_SWITCH, "wb_path", "1", "Walkbot path");
+CatVar draw_nodes(CV_SWITCH, "wb_nodes", "1", "Walkbot nodes");
+CatVar draw_indices(CV_SWITCH, "wb_indices", "1", "Node indices");
 
 void Initialize() {
 }
 
+// Draws a single colored connection between 2 nodes
+void DrawConnection(index_t a, index_t b) {
+	if (not (state::node_good(a) and state::node_good(b)))
+		return;
+
+	const auto& a_ = state::nodes[a];
+	const auto& b_ = state::nodes[b];
+
+	Vector wts_a, wts_b;
+	if (not (draw::WorldToScreen(a_.xyz, wts_a) and draw::WorldToScreen(b_.xyz, wts_b)))
+		return;
+
+	rgba_t* color = &colors::white;
+	if 		((a_.flags & b_.flags) & NF_JUMP) color = &colors::yellow;
+	else if ((a_.flags & b_.flags) & NF_DUCK) color = &colors::green;
+
+	drawgl::Line(wts_a.x, wts_a.y, wts_b.x - wts_a.x, wts_b.y - wts_a.y, color->rgba);
+}
+
+// Draws a node and its connections
+void DrawNode(index_t node, bool draw_back) {
+	if (not state::node_good(node))
+		return;
+
+	const auto& n = state::nodes[node];
+
+	for (size_t i = 0; i < n.connection_count && i < MAX_CONNECTIONS; i++) {
+		index_t connection = n.connections[i];
+		// To prevent drawing connections twice in a for loop, we only draw connections to nodes with higher index
+		if (not draw_back) {
+			if (connection < node)
+				continue;
+		}
+		DrawConnection(node, connection);
+	}
+
+	if (draw_nodes) {
+		rgba_t* color = &colors::white;
+		if 		(n.flags & NF_JUMP) color = &colors::yellow;
+		else if (n.flags & NF_DUCK) color = &colors::green;
+
+		Vector wts;
+		if (not draw::WorldToScreen(n.xyz, wts))
+			return;
+
+		drawgl::Rect(wts.x - 2, wts.y - 2, 4, 4, color->rgba);
+	}
+
+	if (draw_indices) {
+		rgba_t* color = &colors::white;
+		if 		(n.flags & NF_JUMP) color = &colors::yellow;
+		else if (n.flags & NF_DUCK) color = &colors::green;
+
+		Vector wts;
+		if (not draw::WorldToScreen(n.xyz, wts))
+			return;
+
+		FTGL_Draw(std::to_string(node), wts.x, wts.y, fonts::ftgl_ESP, *color);
+	}
+}
+
+void DrawPath() {
+	for (index_t i = 0; i < state::nodes.size(); i++) {
+
+	}
+}
+
 void Draw() {
-	if (state == WB_DISABLED) return;
-	switch (state) {
+	if (state::state == WB_DISABLED) return;
+	switch (state::state) {
 	case WB_RECORDING: {
 		AddSideString("Walkbot: Recording");