diff --git a/axe.js b/axe.js
index 0667a2a5..04ab890c 100644
--- a/axe.js
+++ b/axe.js
@@ -60,7 +60,7 @@
         // with one common superpeer (with ready failovers)
         // in case the p2p linear latency is high.
         // Or there could be plenty of other better options.
-        console.log("axe", at.opt);
+        console.log("axe");
         if(at.opt.super){
           function verify(msg, send, at) {
             var peers = Object.values(p), puts = Object.keys(msg.put), i, j, peer;
diff --git a/gun.js b/gun.js
index 6e53b6e9..699887ce 100644
--- a/gun.js
+++ b/gun.js
@@ -2027,7 +2027,7 @@
 					if(peer.batch){
 						peer.tail = (peer.tail || 0) + raw.length;
 						if(peer.tail <= opt.pack){
-							(msg.dam) ? peer.batch.unshift(raw) : peer.batch.push(raw);
+							peer.batch.push(raw);
 							return;
 						}
 						flush(peer);
@@ -2131,7 +2131,9 @@
 
 			mesh.hear['!'] = function(msg, peer){ opt.log('Error:', msg.err) }
 			mesh.hear['?'] = function(msg, peer){
-				if(!msg.pid){ return mesh.say({dam: '?', pid: opt.pid, '@': msg['#']}, peer) }
+				if(!msg.pid){
+					return mesh.say({dam: '?', pid: opt.pid, '@': msg['#']}, peer);
+				}
 				peer.id = peer.id || msg.pid;
 				mesh.hi(peer);
 			}
diff --git a/package.json b/package.json
index badddce1..cf3e4015 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "prepublishOnly": "npm run unbuild",
     "test": "mocha",
     "testsea": "mocha test/sea.js",
+    "testaxe": "mocha test/axe/holy-grail.js",
     "e2e": "mocha e2e/distributed.js",
     "docker": "hooks/build",
     "unbuild": "node lib/unbuild.js && uglifyjs gun.js -o gun.min.js -c -m"
diff --git a/src/adapters/mesh.js b/src/adapters/mesh.js
index 97ca2456..3cdec6dd 100644
--- a/src/adapters/mesh.js
+++ b/src/adapters/mesh.js
@@ -20,7 +20,7 @@ function Mesh(ctx){
 			return;
 		}
 		// add hook for AXE?
-		//if (Gun.AXE && opt && opt.super) { Gun.AXE.say(msg, mesh.say, this); return; } // rogowski
+		if (Gun.AXE && opt && opt.super) { Gun.AXE.say(msg, mesh.say, this); return; } // rogowski
 		mesh.say(msg);
 	}
 
@@ -101,7 +101,7 @@ function Mesh(ctx){
 			if(peer.batch){
 				peer.tail = (peer.tail || 0) + raw.length;
 				if(peer.tail <= opt.pack){
-					(msg.dam) ? peer.batch.unshift(raw) : peer.batch.push(raw);
+					peer.batch.push(raw);
 					return;
 				}
 				flush(peer);
@@ -205,7 +205,9 @@ function Mesh(ctx){
 
 	mesh.hear['!'] = function(msg, peer){ opt.log('Error:', msg.err) }
 	mesh.hear['?'] = function(msg, peer){
-		if(!msg.pid){ return mesh.say({dam: '?', pid: opt.pid, '@': msg['#']}, peer) }
+		if(!msg.pid){
+			return mesh.say({dam: '?', pid: opt.pid, '@': msg['#']}, peer);
+		}
 		peer.id = peer.id || msg.pid;
 		mesh.hi(peer);
 	}
diff --git a/test/axe/holy-grail.js b/test/axe/holy-grail.js
new file mode 100644
index 00000000..f4e9903e
--- /dev/null
+++ b/test/axe/holy-grail.js
@@ -0,0 +1,331 @@
+/**
+ * AXE test 1
+ * What we want here: (1) Superpeer and (n) peers
+ *  - The peers receives only the requested data.
+ *  - If the Superpeer crash, must recreate all subscriptions and update the peers.
+ *  - If some peer crash or go offline, when connected again must receive the changes made by others while out.
+ *
+ * Tip: to run this `npm run testaxe`
+ * Tip 2: if you clone the gun repo, you need to create a link do gun package. Do `npm install && cd node_modules && ln -s ../ gun`
+ * Tip 3: If you not in localhost, run the browsers in anonymous mode because of domain security policies. https://superuser.com/questions/565409/how-to-stop-an-automatic-redirect-from-http-to-https-in-chrome
+ */
+var config = {
+	IP: require('ip').address(),
+	port: 8765,
+	servers: 2,
+	browsers: 2,
+	route: {
+		'/': __dirname + '/index.html',
+		'/gun.js': __dirname + '/../../gun.js',
+		'/gun/axe.js': __dirname + '/../../axe.js',
+		'/jquery.js': __dirname + '/../../examples/jquery.js'
+	}
+}
+
+var panic = require('panic-server');
+panic.server().on('request', function(req, res){
+	config.route[req.url] && require('fs').createReadStream(config.route[req.url]).pipe(res);
+}).listen(config.port);
+
+var clients = panic.clients;
+var manager = require('panic-manager')();
+manager.start({
+    clients: Array(config.servers).fill().map(function(u, i){
+			return {
+				type: 'node',
+				port: config.port + (i + 1)
+			}
+		}),
+		panic: 'http://' + config.IP + ':' + config.port
+});
+
+var servers = clients.filter('Node.js');
+var server = servers.pluck(1);
+var server2 = servers.excluding(server).pluck(1);
+var browsers = clients.excluding(servers);
+var alice = browsers.pluck(1);
+var bob = browsers.excluding(alice).pluck(1);
+var again = {};
+
+describe("The Holy Grail AXE Test!", function(){
+	console.time('TOTAL TEST TIME');
+	this.timeout(5 * 60 * 1000);
+// 	this.timeout(10 * 60 * 1000);
+
+	it("Servers have joined!", function(){
+		return servers.atLeast(config.servers);
+	});
+
+	it("GUN started!", function(){
+		return server.run(function(test){
+			var env = test.props;
+			test.async();
+			try{ require('fs').unlinkSync(env.i+'dataaxe') }catch(e){}
+			try{ require('fs').unlinkSync((env.i+1)+'dataaxe') }catch(e){}
+			var port = env.config.port + env.i;
+			var server = require('http').createServer(function(req, res){
+				res.end("I am "+ env.i +"!");
+			});
+			var Gun = require('gun');
+			require('gun/axe');
+			var gun = Gun({
+				file: env.i+'dataaxe',
+				web: server
+			});
+			server.listen(port, function(){
+				test.done();
+			});
+		}, {i: 1, config: config});
+	});
+
+	it(config.browsers +" browser(s) have joined!", function(){
+		console.log("PLEASE OPEN http://"+ config.IP +":"+ config.port +" IN "+ config.browsers +" BROWSER(S)!");
+		return browsers.atLeast(config.browsers);
+	});
+
+	it("Browsers initialized gun!", function(){
+		var tests = [], i = 0;
+		browsers.each(function(client, id){
+			tests.push(client.run(function(test){
+				localStorage.clear(); console.log('Clear localStorage!!!');
+				var env = test.props;
+				var gun = window.gun = Gun({peers:['http://'+ env.config.IP + ':' + (env.config.port + 1) + '/gun'], wait: 1000});
+				window.ref = gun.get('holy').get('grail');
+			}, {i: i += 1, config: config}));
+		});
+		return Promise.all(tests);
+	});
+
+	it("Wait for Alice and Bob...", function(done){
+		setTimeout(done, 1000);
+	});
+
+	it("Alice Write: Hi Bob!", function(){
+		return alice.run(function(test){
+			console.log("I AM ALICE");
+			test.async();
+			ref.once(function() { // TODO: Need `.once` first for subscription. If Alice do a `.put` before a `.once`, Alice will get old data from localStorage if Bob update
+				ref.put('Hi Bob!', function(ack) {
+					console.log(ack);
+					setTimeout(test.done, 10000);
+				});
+			});
+		});
+	});
+
+	it("Bob receive ONCE from Alice: Hi Bob!", function(){
+		return bob.run(function(test){
+			console.log("I AM BOB");
+			test.async();
+			ref.once(function(data){
+				if('Hi Bob!' === data){
+					console.log('[OK] Bob receive the question: ', data);
+					return test.done();
+				} else {
+					var err = '[FAIL] Bob MUST receive: Hi Bob! but receive: ' + data + ' Storage: ' + localStorage.getItem('gun/');
+					console.log(err);
+					return test.fail(err);
+				}
+			})
+		})
+	});
+
+	it("Bob Write response: Hi Alice!", function(){
+		return bob.run(function(test){
+			test.async();
+			ref.put('Hi Alice!', function(ack) {
+				console.log('[OK] Bob Write response: Hi Alice!', ack);
+				setTimeout(test.done, 2000);
+			});
+		});
+	});
+
+	it("Alice Read response from Bob: Hi Alice!", function(){
+		return alice.run(function(test){
+			test.async();
+			ref.once(function(data){
+				if('Hi Alice!' === data){
+					console.log('[OK] Alice receive the response: ', data);
+					return test.done();
+				} else {
+					//TODO: aqui em duvida.. está pegando do localStorage, mas Bob alterou o dado.
+					var err = '[FAIL] Alice receive wrong response: "' + data + '" and must be "Hi Alice!"';
+					console.log(err);
+					return test.fail(err);
+				}
+			})
+		})
+	});
+
+	it("Bob Write in some data, Alice not subscribed", function(){
+		return bob.run(function(test){
+			test.async();
+			gun.get('bob').get('mine').put('Alice dont want this data!', function() {
+				setTimeout(test.done, 2000);
+			});
+		});
+	});
+
+	it("Alice not subscribed. Must NOT receive data from Bob", function(){
+		return alice.run(function(test){
+			test.async();
+			/// This must be empty, because alice don't make a subscription to this node.
+			var bobdata = JSON.parse(localStorage.getItem('gun/')).bob;
+			if (bobdata) {
+				var err = '[FAIL] Alice receive not subscribed data: ' + JSON.stringify(bobdata);
+				console.log(err);
+				return test.fail(err);
+			} else {
+				console.log('[OK] Alice Read must NOT receive data from Bob: ', bobdata);
+				return test.done();
+			}
+		})
+	});
+
+	it("Alice subscription Bob data with ONCE, MUST receive", function(){
+		return alice.run(function(test){
+			test.async();
+			gun.get('bob').once(function(data){
+				if(data){
+					console.log('[OK] Alice receive the value: ', data);
+					return test.done();
+				} else {
+					var err = '[FAIL] Alice receive the value: ' + data;
+					console.log(err);
+					return test.fail(err);
+				}
+			})
+		})
+	});
+
+	it("Bob Write in some data. Now Alice is subscribed.", function(){
+		return bob.run(function(test){
+			test.async();
+			gun.get('bob').get('mine').put('Alice WANT this data now!', function() {
+				setTimeout(test.done, 2000);
+			});
+		});
+	});
+
+	it("Alice must receive updates from Bob node", function(){
+		return alice.run(function(test){
+			test.async();
+			if (gun._.graph.bob && gun._.graph.bob.mine === 'Alice WANT this data now!') {
+				console.log('[OK] GRAPH: ', gun._.graph.bob);
+				test.done();
+			} else {
+				var err = '[FAIL] GRAPH: ' + JSON.stringify(gun._.graph.bob);
+				console.log(err);
+				test.fail(err);
+			}
+		})
+	});
+
+	it("Server has crashed!", function(){
+		return server.run(function(test){
+			console.log(3);
+// 			var env = test.props;
+// 			try{ require('fs').unlinkSync(env.i+'data'); }catch(e){}
+			process.exit(0);
+		}, {i: 1, config: config})
+	});
+
+	it("Wait...", function(done){
+		console.log(4);
+		setTimeout(done, 2000);
+	});
+
+	it("Alice update the data (superpeer crashed yet).", function(){
+		return alice.run(function(test){
+			var env = test.props;
+			if(window.WebSocket){
+				var err;
+				try{ new WebSocket('http://'+ env.config.IP + ':' + (env.config.port + 2) + '/gun') }catch(e){ err = e }
+				if(!err){
+					test.fail("Server did not crash.");
+				}
+			}
+			test.async()
+			ref.put("Superpeer? Where are you?", function() {
+				setTimeout(test.done, 100);
+			});
+		}, {config: config});
+	});
+
+	it("Bob can't see what Alice change because Superpeer is out.", function(){
+		return bob.run(function(test){
+			test.async();
+			ref.once(function(data){
+				if('Superpeer? Where are you?' !== data){
+					console.log('[OK] Bob have old data: ', data);
+					return test.done();
+				} else {
+					var err = '[FAIL] Bob MUST not receive: "Superpeer? Where are you?", but receive: ' + data;
+					console.log(err);
+					return test.fail(err);
+				}
+			})
+		})
+	});
+
+	it("Superpeer come started again!", function(){
+		return server2.run(function(test){
+			var env = test.props;
+			test.async();
+// 			try{ require('fs').unlinkSync(env.i+'dataaxe') }catch(e){}
+// 			try{ require('fs').unlinkSync((env.i+1)+'dataaxe') }catch(e){}
+			var port = env.config.port + env.i;
+			var server = require('http').createServer(function(req, res){
+				res.end("I am "+ env.i +"!");
+			});
+			var Gun = require('gun');
+			require('gun/axe');
+			var gun = Gun({
+				file: env.i+'dataaxe',
+				web: server
+			});
+			server.listen(port, function(){
+				test.done();
+			});
+		}, {i: 1, config: config});
+	});
+
+	it("Wait sync...", function(done){
+		console.log(4);
+		setTimeout(done, 5000);
+	});
+
+	it("Bob now receive what Alice change because Superpeer is on.", function(){
+		return bob.run(function(test){
+			test.async();
+			ref.once(function(data){
+				if('Superpeer? Where are you?' === data){
+					console.log('[OK] Bob have old data: ', data);
+					return test.done();
+				} else {
+					var err = '[FAIL] Bob MUST not receive: "Superpeer? Where are you?", but receive: ' + data;
+					console.log(err);
+					return test.fail(err);
+				}
+			})
+		})
+	});
+
+	it("All finished!", function(done){
+		console.log("Done! Cleaning things up...");
+		setTimeout(function(){
+			done();
+		},1000);
+	});
+	after("Everything shut down.", function(){
+		browsers.run(function(){
+			//location.reload();
+			//setTimeout(function(){
+			//}, 15 * 1000);
+		});
+		return servers.run(function(){
+			process.exit();
+		});
+		console.timeEnd('TOTAL TEST TIME');
+	});
+});
diff --git a/test/axe/index.html b/test/axe/index.html
new file mode 100644
index 00000000..28e26c42
--- /dev/null
+++ b/test/axe/index.html
@@ -0,0 +1,9 @@
+<script src='panic.js'></script>
+<script>panic.server(location.origin)</script>
+<script src='gun.js'></script>
+<script src='gun/axe.js'></script>
+<script src='jquery.js'></script>
+<meta charset="utf-8"/>
+<h1>Running AXE Tests.</h1>
+<div id="log"></div>
+<!-- <textarea id="print" style="width: 100%; height: 90%; border: 0;"></textarea> -->