Fixed duplicate move bug that removes any previous hit from the map
Added to todo