diff --git a/dist/scripts.js b/dist/scripts.js
index c9b30f0..3c78a7f 100644
--- a/dist/scripts.js
+++ b/dist/scripts.js
@@ -114,6 +114,7 @@ var KanbanBoard = function () {
    }, {
       key: 'mouseEnterLane',
       value: function mouseEnterLane(lane) {
+         console.log('board knows: mouse enter lane');
          if (this.heldCard) {
             this.putCardInLane(this.heldCard.id, lane.id);
          }
@@ -147,7 +148,7 @@ var KanbanBoard = function () {
    }, {
       key: 'mouseMove',
       value: function mouseMove(x, y) {
-         console.log('board knows: mouse move');
+         //console.log('board knows: mouse move')
          if (this.heldCard) {
             if (!this.heldCard.moved) {
                this.heldCard.hold();
@@ -156,26 +157,6 @@ var KanbanBoard = function () {
             this.ghost.move(x, y);
          }
       }
-   }, {
-      key: 'cardDragOver',
-      value: function cardDragOver(ele) {
-         // Chrome - Safari: Move to lane hack
-         if (!this.held || ele == this.held) return;
-         if (ele.tagName.toLowerCase() == 'lane-cards') {
-            // Safari calls child first skip this
-            if (!this.movedToCardAndLane) ele.appendChild(this.held);
-            this.movedToLane = true;
-            this.movedToCardAndLane = false;
-            return;
-         }
-
-         // Chrome calls parent first
-         // If that happened OR safari calls child first. Set above
-         this.movedToCardAndLane = ele.parentElement != this.held.parentElement;
-         ele.nextSibling == this.held || this.movedToLane || this.movedToCardAndLane ? ele.parentElement.insertBefore(this.held, ele) : ele.parentElement.insertBefore(this.held, ele.nextSibling);
-
-         this.movedToLane = false;
-      }
 
       // This one will get scarey
 
@@ -377,16 +358,16 @@ var KanbanLane = function () {
       value: function listen() {
          var _this5 = this;
 
-         this.html.cards.addEventListener('mouseenter', function () {
-            _this5.mouseenter();
+         this.html.cards.addEventListener('mouseenter', function (e) {
+            _this5.mouseenter(e);
          });
-         this.html.title.addEventListener('click', function () {
-            _this5.toggle();
+         this.html.title.addEventListener('click', function (e) {
+            _this5.toggle(e);
          });
       }
    }, {
       key: 'mouseenter',
-      value: function mouseenter() {
+      value: function mouseenter(e) {
          this.onMouseEnterLane(this);
       }
    }, {
@@ -394,17 +375,27 @@ var KanbanLane = function () {
       value: function toggle() {
          this.html.lane.classList.toggle('collapse');
       }
+
+      // These are a bit spookey I would just leave them alone for now
+
    }, {
       key: 'append',
       value: function append(card) {
-         this.html.cards.appendChild(card.html);
          card.lane = this.id;
+         if (!card.movedToCardAndLane) this.html.cards.appendChild(card.html);
+         card.movedToCardAndLane = false;
       }
    }, {
       key: 'appendCardAroundCard',
       value: function appendCardAroundCard(card1, card2) {
-         !card2.html.nextSibling ? this.append(card1) : this.html.cards.insertBefore(card1.html, card2.html);
          card1.lane = this.id;
+         card1.movedToCardAndLane = card1.html.parentElement != card2.html.parentElement;
+         if (!card2.html.nextSibling && !card1.movedToCardAndLane) {
+            this.append(card1);
+            return;
+         }
+
+         this.html.cards.insertBefore(card1.html, card2.html);
       }
    }]);
 
diff --git a/dist/scripts.min.js b/dist/scripts.min.js
index 4eaf635..b33ceff 100644
--- a/dist/scripts.min.js
+++ b/dist/scripts.min.js
@@ -1 +1 @@
-"use strict";function _classCallCheck(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}(),KanbanBoard=function(){function t(e){_classCallCheck(this,t),this.selector=e,this.lanes=[],this.cards=[],this.heldCard=void 0,this.heldCardMoved=!1,this.html={},this.create(),this.createGhost(),this.html.container.appendChild(this.html.board),this.addListeners()}return _createClass(t,[{key:"create",value:function(){this.html.container=document.querySelector(this.selector),this.html.board=this.createBoard(),this.html.cards=[]}},{key:"createGhost",value:function(){this.ghost=new KanbanGhost,this.html.board.appendChild(this.ghost.html)}},{key:"addListeners",value:function(){var t=this;window.addEventListener("mouseup",function(e){t.mouseUp()}),window.addEventListener("mousemove",function(e){t.mouseMove(e.clientX,e.clientY)}),document.body.addEventListener("blur",function(e){t.cardUp()})}},{key:"createBoard",value:function(){return document.createElement("kanban")}},{key:"addLane",value:function(t){var e=this;this.lanes.push(t),t.onMouseEnterLane=function(t){e.mouseEnterLane(t)},this.html.board.appendChild(t.html.lane)}},{key:"addCard",value:function(t){var e=this;this.cards.push(t),t.onMouseEnter=function(t){e.mouseEnterCard(t)},t.onMouseDown=function(t,n,i){e.mouseDownOnCard(t,n,i)},this.putCardInLane(t.id,t.lane)}},{key:"findLane",value:function(t){return this.lanes.find(function(e){return e.id==t})}},{key:"findCard",value:function(t){return this.cards.find(function(e){return e.id==t})}},{key:"putCardInLane",value:function(t,e){this.findLane(e).append(this.findCard(t))}},{key:"putCardAroundCard",value:function(t,e){var n=this.findCard(t),i=this.findCard(e);n.id!=i.id&&this.findLane(i.lane).appendCardAroundCard(n,i)}},{key:"mouseEnterLane",value:function(t){this.heldCard&&this.putCardInLane(this.heldCard.id,t.id)}},{key:"mouseEnterCard",value:function(t){console.log("board knows: mouse enter card"),this.heldCard&&(console.log("Put Card above"),this.putCardAroundCard(this.heldCard.id,t.id))}},{key:"mouseDownOnCard",value:function(t,e,n){console.log("board knows: mouse down card"),this.heldCard=t,this.heldCard.grab(),this.ghost.grab(t)}},{key:"mouseUp",value:function(){console.log("board knows: mouse up"),this.heldCard.drop(),this.ghost.hide(),this.heldCard=void 0}},{key:"mouseMove",value:function(t,e){console.log("board knows: mouse move"),this.heldCard&&(this.heldCard.moved||(this.heldCard.hold(),this.ghost.show()),this.ghost.move(t,e))}},{key:"cardDragOver",value:function(t){if(this.held&&t!=this.held){if("lane-cards"==t.tagName.toLowerCase())return this.movedToCardAndLane||t.appendChild(this.held),this.movedToLane=!0,void(this.movedToCardAndLane=!1);this.movedToCardAndLane=t.parentElement!=this.held.parentElement,t.nextSibling==this.held||this.movedToLane||this.movedToCardAndLane?t.parentElement.insertBefore(this.held,t):t.parentElement.insertBefore(this.held,t.nextSibling),this.movedToLane=!1}}},{key:"scroll",value:function(){}}]),t}(),KanbanCard=function(){function t(e,n,i,s){_classCallCheck(this,t),this.id=e,this.lane=n,this.content=i,this.template=s,this.html={},this.create(),this.listen()}return _createClass(t,[{key:"create",value:function(){this.html=document.createElement("card"),this.html.innerHTML=this.template(this.content)}},{key:"listen",value:function(){var t=this;this.html.addEventListener("mouseenter",function(e){t.mouseenter(e)}),this.html.addEventListener("mousedown",function(e){t.mousedown(e)})}},{key:"grab",value:function(){this.moved=!1}},{key:"hold",value:function(){this.moved=!0,this.html.classList.add("held")}},{key:"drop",value:function(){this.html.classList.remove("held")}},{key:"mouseenter",value:function(){this.onMouseEnter(this)}},{key:"mousedown",value:function(t){var e=t.target.getBoundingClientRect(),n=this.html.getBoundingClientRect();this.grabWidth=n.width,this.grabOffsetX=-t.offsetX-(e.left-n.left),this.grabOffsetY=-t.offsetY-(e.top-n.top),this.onMouseDown(this)}}]),t}(),KanbanGhost=function(){function t(){_classCallCheck(this,t),this.x=0,this.y=0,this.width=0,this.offsetX=0,this.offsetY=0,this.display="none",this.create()}return _createClass(t,[{key:"create",value:function(){this.html=document.createElement("ghost")}},{key:"grab",value:function(t){this.html.innerHTML=t.html.innerHTML,this.width=t.grabWidth,this.offsetX=t.grabOffsetX,this.offsetY=t.grabOffsetY,this.setStyles()}},{key:"show",value:function(){this.display="block",this.setStyles()}},{key:"hide",value:function(){this.display="none",this.setStyles()}},{key:"move",value:function(t,e){this.x=t,this.y=e,this.setStyles()}},{key:"setStyles",value:function(){this.html.style.transform="translateX("+this.x+"px) translateY("+this.y+"px)",this.html.style.width=this.width+"px",this.html.style.left=this.offsetX+"px",this.html.style.top=this.offsetY+"px",this.html.style.display=this.display}}]),t}(),KanbanLane=function(){function t(e,n,i){_classCallCheck(this,t),this.id=e,this.content=n,this.template=i,this.html={lane:void 0,title:void 0,cards:void 0},this.create(),this.listen()}return _createClass(t,[{key:"create",value:function(){this.html.lane=document.createElement("lane"),this.html.title=document.createElement("lane-title"),this.html.cards=document.createElement("lane-cards"),this.html.lane.id=this.id,this.html.title.innerHTML=this.template(this.content),this.html.lane.appendChild(this.html.title),this.html.lane.appendChild(this.html.cards)}},{key:"listen",value:function(){var t=this;this.html.cards.addEventListener("mouseenter",function(){t.mouseenter()}),this.html.title.addEventListener("click",function(){t.toggle()})}},{key:"mouseenter",value:function(){this.onMouseEnterLane(this)}},{key:"toggle",value:function(){this.html.lane.classList.toggle("collapse")}},{key:"append",value:function(t){this.html.cards.appendChild(t.html),t.lane=this.id}},{key:"appendCardAroundCard",value:function(t,e){e.html.nextSibling?this.html.cards.insertBefore(t.html,e.html):this.append(t),t.lane=this.id}}]),t}();
\ No newline at end of file
+"use strict";function _classCallCheck(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function t(t,e){for(var n=0;n<e.length;n++){var s=e[n];s.enumerable=s.enumerable||!1,s.configurable=!0,"value"in s&&(s.writable=!0),Object.defineProperty(t,s.key,s)}}return function(e,n,s){return n&&t(e.prototype,n),s&&t(e,s),e}}(),KanbanBoard=function(){function t(e){_classCallCheck(this,t),this.selector=e,this.lanes=[],this.cards=[],this.heldCard=void 0,this.heldCardMoved=!1,this.html={},this.create(),this.createGhost(),this.html.container.appendChild(this.html.board),this.addListeners()}return _createClass(t,[{key:"create",value:function(){this.html.container=document.querySelector(this.selector),this.html.board=this.createBoard(),this.html.cards=[]}},{key:"createGhost",value:function(){this.ghost=new KanbanGhost,this.html.board.appendChild(this.ghost.html)}},{key:"addListeners",value:function(){var t=this;window.addEventListener("mouseup",function(e){t.mouseUp()}),window.addEventListener("mousemove",function(e){t.mouseMove(e.clientX,e.clientY)}),document.body.addEventListener("blur",function(e){t.cardUp()})}},{key:"createBoard",value:function(){return document.createElement("kanban")}},{key:"addLane",value:function(t){var e=this;this.lanes.push(t),t.onMouseEnterLane=function(t){e.mouseEnterLane(t)},this.html.board.appendChild(t.html.lane)}},{key:"addCard",value:function(t){var e=this;this.cards.push(t),t.onMouseEnter=function(t){e.mouseEnterCard(t)},t.onMouseDown=function(t,n,s){e.mouseDownOnCard(t,n,s)},this.putCardInLane(t.id,t.lane)}},{key:"findLane",value:function(t){return this.lanes.find(function(e){return e.id==t})}},{key:"findCard",value:function(t){return this.cards.find(function(e){return e.id==t})}},{key:"putCardInLane",value:function(t,e){this.findLane(e).append(this.findCard(t))}},{key:"putCardAroundCard",value:function(t,e){var n=this.findCard(t),s=this.findCard(e);n.id!=s.id&&this.findLane(s.lane).appendCardAroundCard(n,s)}},{key:"mouseEnterLane",value:function(t){console.log("board knows: mouse enter lane"),this.heldCard&&this.putCardInLane(this.heldCard.id,t.id)}},{key:"mouseEnterCard",value:function(t){console.log("board knows: mouse enter card"),this.heldCard&&(console.log("Put Card above"),this.putCardAroundCard(this.heldCard.id,t.id))}},{key:"mouseDownOnCard",value:function(t,e,n){console.log("board knows: mouse down card"),this.heldCard=t,this.heldCard.grab(),this.ghost.grab(t)}},{key:"mouseUp",value:function(){console.log("board knows: mouse up"),this.heldCard.drop(),this.ghost.hide(),this.heldCard=void 0}},{key:"mouseMove",value:function(t,e){this.heldCard&&(this.heldCard.moved||(this.heldCard.hold(),this.ghost.show()),this.ghost.move(t,e))}},{key:"scroll",value:function(){}}]),t}(),KanbanCard=function(){function t(e,n,s,i){_classCallCheck(this,t),this.id=e,this.lane=n,this.content=s,this.template=i,this.html={},this.create(),this.listen()}return _createClass(t,[{key:"create",value:function(){this.html=document.createElement("card"),this.html.innerHTML=this.template(this.content)}},{key:"listen",value:function(){var t=this;this.html.addEventListener("mouseenter",function(e){t.mouseenter(e)}),this.html.addEventListener("mousedown",function(e){t.mousedown(e)})}},{key:"grab",value:function(){this.moved=!1}},{key:"hold",value:function(){this.moved=!0,this.html.classList.add("held")}},{key:"drop",value:function(){this.html.classList.remove("held")}},{key:"mouseenter",value:function(){this.onMouseEnter(this)}},{key:"mousedown",value:function(t){var e=t.target.getBoundingClientRect(),n=this.html.getBoundingClientRect();this.grabWidth=n.width,this.grabOffsetX=-t.offsetX-(e.left-n.left),this.grabOffsetY=-t.offsetY-(e.top-n.top),this.onMouseDown(this)}}]),t}(),KanbanGhost=function(){function t(){_classCallCheck(this,t),this.x=0,this.y=0,this.width=0,this.offsetX=0,this.offsetY=0,this.display="none",this.create()}return _createClass(t,[{key:"create",value:function(){this.html=document.createElement("ghost")}},{key:"grab",value:function(t){this.html.innerHTML=t.html.innerHTML,this.width=t.grabWidth,this.offsetX=t.grabOffsetX,this.offsetY=t.grabOffsetY,this.setStyles()}},{key:"show",value:function(){this.display="block",this.setStyles()}},{key:"hide",value:function(){this.display="none",this.setStyles()}},{key:"move",value:function(t,e){this.x=t,this.y=e,this.setStyles()}},{key:"setStyles",value:function(){this.html.style.transform="translateX("+this.x+"px) translateY("+this.y+"px)",this.html.style.width=this.width+"px",this.html.style.left=this.offsetX+"px",this.html.style.top=this.offsetY+"px",this.html.style.display=this.display}}]),t}(),KanbanLane=function(){function t(e,n,s){_classCallCheck(this,t),this.id=e,this.content=n,this.template=s,this.html={lane:void 0,title:void 0,cards:void 0},this.create(),this.listen()}return _createClass(t,[{key:"create",value:function(){this.html.lane=document.createElement("lane"),this.html.title=document.createElement("lane-title"),this.html.cards=document.createElement("lane-cards"),this.html.lane.id=this.id,this.html.title.innerHTML=this.template(this.content),this.html.lane.appendChild(this.html.title),this.html.lane.appendChild(this.html.cards)}},{key:"listen",value:function(){var t=this;this.html.cards.addEventListener("mouseenter",function(e){t.mouseenter(e)}),this.html.title.addEventListener("click",function(e){t.toggle(e)})}},{key:"mouseenter",value:function(t){this.onMouseEnterLane(this)}},{key:"toggle",value:function(){this.html.lane.classList.toggle("collapse")}},{key:"append",value:function(t){t.lane=this.id,t.movedToCardAndLane||this.html.cards.appendChild(t.html),t.movedToCardAndLane=!1}},{key:"appendCardAroundCard",value:function(t,e){t.lane=this.id,t.movedToCardAndLane=t.html.parentElement!=e.html.parentElement,e.html.nextSibling||t.movedToCardAndLane?this.html.cards.insertBefore(t.html,e.html):this.append(t)}}]),t}();
\ No newline at end of file
diff --git a/example/basic.html b/example/basic.html
index 816be74..61e23a1 100644
--- a/example/basic.html
+++ b/example/basic.html
@@ -22,8 +22,9 @@
          mykanban.addLane(new KanbanLane('lane5', 'Lane 5', laneTemplate))
 
          // Add Cards
-         mykanban.addCard(new KanbanCard('card1', 'lane1', 'demo', cardTemplate))
-         mykanban.addCard(new KanbanCard('card2', 'lane2', 'demo', cardTemplate))
+         mykanban.addCard(new KanbanCard('card1', 'lane1', 'demo 1', cardTemplate))
+         mykanban.addCard(new KanbanCard('card3', 'lane1', 'demo 3', cardTemplate))
+         mykanban.addCard(new KanbanCard('card2', 'lane2', 'demo 2', cardTemplate))
 
          /*
 
diff --git a/src/Board.js b/src/Board.js
index c4e994a..5e3d347 100644
--- a/src/Board.js
+++ b/src/Board.js
@@ -69,6 +69,7 @@ class KanbanBoard {
 
    // All the events
    mouseEnterLane(lane) {
+      console.log('board knows: mouse enter lane')
       if(this.heldCard) {
          this.putCardInLane(this.heldCard.id, lane.id)
       }
@@ -98,7 +99,7 @@ class KanbanBoard {
    }
 
    mouseMove(x, y) {
-      console.log('board knows: mouse move')
+      //console.log('board knows: mouse move')
       if(this.heldCard) {
          if(!this.heldCard.moved) {
             this.heldCard.hold()
@@ -108,28 +109,6 @@ class KanbanBoard {
       }
    }
 
-   cardDragOver(ele){
-      // Chrome - Safari: Move to lane hack
-      if(!this.held || ele == this.held) return
-      if(ele.tagName.toLowerCase() == 'lane-cards'){
-         // Safari calls child first skip this
-         if(!this.movedToCardAndLane)
-            ele.appendChild(this.held)
-         this.movedToLane = true
-         this.movedToCardAndLane = false
-         return
-      }
-
-      // Chrome calls parent first
-      // If that happened OR safari calls child first. Set above
-      this.movedToCardAndLane = ele.parentElement != this.held.parentElement
-      ele.nextSibling == this.held || this.movedToLane || this.movedToCardAndLane
-         ? ele.parentElement.insertBefore(this.held,  ele)
-         : ele.parentElement.insertBefore(this.held,  ele.nextSibling)
-
-      this.movedToLane = false
-   }
-
    // This one will get scarey
    scroll() { }
 }
diff --git a/src/Lane.js b/src/Lane.js
index 69fad37..591b748 100644
--- a/src/Lane.js
+++ b/src/Lane.js
@@ -25,11 +25,11 @@ class KanbanLane {
    }
 
    listen() {
-      this.html.cards.addEventListener('mouseenter', () => { this.mouseenter() })
-      this.html.title.addEventListener('click', () => { this.toggle() })
+      this.html.cards.addEventListener('mouseenter', (e) => { this.mouseenter(e) })
+      this.html.title.addEventListener('click', (e) => { this.toggle(e) })
    }
 
-   mouseenter() {
+   mouseenter(e) {
       this.onMouseEnterLane(this)
    }
 
@@ -37,15 +37,21 @@ class KanbanLane {
       this.html.lane.classList.toggle('collapse')
    }
 
+   // These are a bit spookey I would just leave them alone for now
    append(card) {
-      this.html.cards.appendChild(card.html)
       card.lane = this.id
+      if(!card.movedToCardAndLane) this.html.cards.appendChild(card.html)
+      card.movedToCardAndLane = false
    }
 
    appendCardAroundCard(card1, card2){
-      !card2.html.nextSibling
-         ? this.append(card1)
-         : this.html.cards.insertBefore(card1.html, card2.html)
       card1.lane = this.id
+      card1.movedToCardAndLane = card1.html.parentElement != card2.html.parentElement
+      if(!card2.html.nextSibling && !card1.movedToCardAndLane){
+         this.append(card1)
+         return
+      }
+
+      this.html.cards.insertBefore(card1.html, card2.html)
    }
 }