diff --git a/src/components/FeaturePanel/Climbing/Editor/MockedPoints.tsx b/src/components/FeaturePanel/Climbing/Editor/MockedPoints.tsx
new file mode 100644
index 000000000..7915c5775
--- /dev/null
+++ b/src/components/FeaturePanel/Climbing/Editor/MockedPoints.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import { useClimbingContext } from '../contexts/ClimbingContext';
+import { machine } from 'node:os';
+import { PointWithType } from './PointWithType';
+
+const data = [
+  {
+    x: 0.1,
+    y: 0.4,
+    type: 'piton',
+    units: 'percentage' as const,
+  },
+  {
+    x: 0.2,
+    y: 0.5,
+    type: 'bolt',
+    units: 'percentage' as const,
+  },
+];
+
+export const MockedPoints = () => {
+  const { isEditMode, getPixelPosition, mockedPoints, getMachine } =
+    useClimbingContext();
+  const machine = getMachine();
+
+  console.log('___', mockedPoints);
+  return (
+    <>
+      {mockedPoints.map((point) => {
+        const position = getPixelPosition({
+          x: point.x,
+          y: point.y,
+          units: 'percentage',
+        });
+
+        return (
+          <PointWithType
+            key={`mocked-point-${point.x}-${point.y}`}
+            isOtherRouteSelected={false}
+            isRouteSelected={true}
+            isPointSelected={true}
+            isWithOffset={isEditMode}
+            isPulsing={false}
+            onMarkedPointClick={() => {}}
+            x={position.x}
+            y={position.y}
+            isEditMode={isEditMode}
+            type={point.type}
+            onPointClick={() => {
+              console.log('___!!');
+              machine.execute('showPointMenu');
+            }}
+            pointIndex={0}
+          />
+        );
+      })}
+    </>
+  );
+};
diff --git a/src/components/FeaturePanel/Climbing/Editor/PointMenu.tsx b/src/components/FeaturePanel/Climbing/Editor/PointMenu.tsx
deleted file mode 100644
index 207646354..000000000
--- a/src/components/FeaturePanel/Climbing/Editor/PointMenu.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import React from 'react';
-
-import RemoveCircleIcon from '@mui/icons-material/RemoveCircle';
-import CloseIcon from '@mui/icons-material/Close';
-import CheckIcon from '@mui/icons-material/Check';
-import DeleteIcon from '@mui/icons-material/Delete';
-import {
-  Popover,
-  DialogTitle,
-  MenuList,
-  MenuItem,
-  ListItemIcon,
-  Typography,
-  Divider,
-} from '@mui/material';
-import { PointType } from '../types';
-import { useClimbingContext } from '../contexts/ClimbingContext';
-
-export const PointMenu = ({ anchorEl, setAnchorEl }) => {
-  const {
-    pointSelectedIndex,
-    setPointSelectedIndex,
-    getMachine,
-    isPointMoving,
-    getCurrentPath,
-  } = useClimbingContext();
-  const machine = getMachine();
-  const open = Boolean(anchorEl) && !isPointMoving;
-  const id = open ? 'simple-popper' : undefined;
-  const selectedPoint = getCurrentPath()[pointSelectedIndex];
-
-  if (!selectedPoint) return null;
-
-  const onPopoverClose = () => {
-    setAnchorEl(null);
-    setPointSelectedIndex(null);
-  };
-  const onDeletePoint = () => {
-    machine.execute('deletePoint');
-  };
-
-  const onPointTypeChange = (type: PointType) => {
-    machine.execute('changePointType', { type });
-
-    onPopoverClose();
-  };
-
-  return (
-    <Popover
-      id={id}
-      open={open}
-      anchorEl={anchorEl}
-      anchorOrigin={{
-        vertical: 'bottom',
-        horizontal: 'left',
-      }}
-      onClose={() => {
-        machine.execute('cancelPointMenu');
-        onPopoverClose();
-      }}
-    >
-      <DialogTitle>Choose point type</DialogTitle>
-
-      <MenuList>
-        <MenuItem
-          dense
-          onClick={() => onPointTypeChange(null)}
-          selected={!selectedPoint.type}
-        >
-          <ListItemIcon />
-          <Typography variant="inherit">Nothing</Typography>
-        </MenuItem>
-        <MenuItem
-          dense
-          onClick={() => onPointTypeChange('bolt')}
-          selected={selectedPoint.type === 'bolt'}
-        >
-          <ListItemIcon>
-            <CloseIcon fontSize="small" />
-          </ListItemIcon>
-          <Typography variant="inherit" noWrap>
-            Bolt / Ring / Hanger
-          </Typography>
-        </MenuItem>
-        <MenuItem
-          dense
-          onClick={() => onPointTypeChange('anchor')}
-          selected={selectedPoint.type === 'anchor'}
-        >
-          <ListItemIcon>
-            <RemoveCircleIcon fontSize="small" />
-          </ListItemIcon>
-          <Typography variant="inherit">Belay</Typography>
-        </MenuItem>
-        <Divider />
-        <MenuItem onClick={onDeletePoint} dense>
-          <ListItemIcon>
-            <DeleteIcon fontSize="small" />
-          </ListItemIcon>
-          <Typography variant="inherit" noWrap>
-            Delete point
-          </Typography>
-        </MenuItem>
-        <MenuItem
-          dense
-          onClick={() => {
-            onPopoverClose();
-            machine.execute('finishRoute');
-          }}
-        >
-          <ListItemIcon>
-            <CheckIcon fontSize="small" />
-          </ListItemIcon>
-          <Typography variant="inherit" noWrap>
-            Finish editing
-          </Typography>
-        </MenuItem>
-      </MenuList>
-    </Popover>
-  );
-};
diff --git a/src/components/FeaturePanel/Climbing/Editor/PointWithType.tsx b/src/components/FeaturePanel/Climbing/Editor/PointWithType.tsx
new file mode 100644
index 000000000..3b558136e
--- /dev/null
+++ b/src/components/FeaturePanel/Climbing/Editor/PointWithType.tsx
@@ -0,0 +1,96 @@
+import React from 'react';
+import { PulsedPoint } from './Points/PulsedPoint';
+import { Bolt } from './Points/Bolt';
+import { Piton } from './Points/Piton';
+import { Sling } from './Points/Sling';
+import { Anchor } from './Points/Anchor';
+import { UnfinishedPoint } from './Points/UnfinishedPoint';
+import { Point } from './Points/Point';
+
+export const PointWithType = ({
+  onPointClick,
+  type,
+  x,
+  y,
+  isOtherRouteSelected,
+  isRouteSelected,
+  isPointSelected,
+  onMarkedPointClick,
+  isPulsing,
+  isEditMode,
+  isWithOffset,
+  pointIndex,
+  routeNumber,
+}) => {
+  const xOffset = isWithOffset ? 15 : 0;
+
+  const isBoltVisible = !isOtherRouteSelected && type === 'bolt';
+  const isAnchorVisible = !isOtherRouteSelected && type === 'anchor';
+  const isSlingVisible = !isOtherRouteSelected && type === 'sling';
+  const isPitonVisible = !isOtherRouteSelected && type === 'piton';
+  const isUnfinishedPointVisible =
+    !isOtherRouteSelected && type === 'unfinished';
+
+  const pointerEvents = isRouteSelected || isEditMode ? 'auto' : 'none';
+  return (
+    <React.Fragment>
+      {isPulsing && <PulsedPoint x={x} y={y} />}
+
+      {isBoltVisible && (
+        <Bolt
+          x={x + xOffset}
+          y={y}
+          isPointSelected={isPointSelected}
+          pointerEvents={pointerEvents}
+          onClick={onMarkedPointClick}
+        />
+      )}
+      {isPitonVisible && (
+        <Piton
+          x={x + xOffset}
+          y={y}
+          isPointSelected={isPointSelected}
+          pointerEvents={pointerEvents}
+          onClick={onMarkedPointClick}
+        />
+      )}
+      {isSlingVisible && (
+        <Sling
+          x={x}
+          y={y}
+          isPointSelected={isPointSelected}
+          pointerEvents={pointerEvents}
+          onClick={onMarkedPointClick}
+        />
+      )}
+      {isAnchorVisible && (
+        <Anchor
+          x={x + xOffset}
+          y={y}
+          isPointSelected={isPointSelected}
+          pointerEvents={pointerEvents}
+          onClick={onMarkedPointClick}
+        />
+      )}
+      {isUnfinishedPointVisible && (
+        <UnfinishedPoint
+          x={x + xOffset}
+          y={y}
+          isPointSelected={isPointSelected}
+          pointerEvents={pointerEvents}
+          onClick={onMarkedPointClick}
+        />
+      )}
+      <Point
+        x={x}
+        y={y}
+        type={type}
+        isRouteSelected={isRouteSelected}
+        isOtherRouteSelected={isOtherRouteSelected}
+        onPointInSelectedRouteClick={onPointClick}
+        index={pointIndex}
+        routeNumber={routeNumber}
+      />
+    </React.Fragment>
+  );
+};
diff --git a/src/components/FeaturePanel/Climbing/Editor/Points/Point.tsx b/src/components/FeaturePanel/Climbing/Editor/Points/Point.tsx
index 9daa38196..268ac11cc 100644
--- a/src/components/FeaturePanel/Climbing/Editor/Points/Point.tsx
+++ b/src/components/FeaturePanel/Climbing/Editor/Points/Point.tsx
@@ -41,6 +41,17 @@ const usePointColor = (type, isHovered) => {
   };
 };
 
+type PointType = {
+  x: number;
+  y: number;
+  onPointInSelectedRouteClick: (e: any) => void;
+  type: any;
+  index: number;
+  routeNumber?: number;
+  isRouteSelected: boolean;
+  isOtherRouteSelected: boolean;
+};
+
 export const Point = ({
   x,
   y,
@@ -48,7 +59,9 @@ export const Point = ({
   type,
   index,
   routeNumber,
-}) => {
+  isRouteSelected,
+  isOtherRouteSelected,
+}: PointType) => {
   const [isHovered, setIsHovered] = useState(false);
   const {
     setPointSelectedIndex,
@@ -61,17 +74,13 @@ export const Point = ({
     photoZoom,
     getCurrentPath,
     setIsPanningDisabled,
-    isRouteSelected,
     isPointSelected,
-    isOtherRouteSelected,
     isEditMode,
   } = useClimbingContext();
   const isMobileMode = useMobileMode();
-  const isSelected = isRouteSelected(routeNumber);
-  const isOtherSelected = isOtherRouteSelected(routeNumber);
   const { pointColor, pointStroke } = usePointColor(type, isHovered);
 
-  const isPointOnRouteSelected = isSelected && isPointSelected(index);
+  const isPointOnRouteSelected = isRouteSelected && isPointSelected(index);
 
   const onPointClick = (e) => {
     e.stopPropagation();
@@ -80,7 +89,7 @@ export const Point = ({
   const onPointMouseEnter = () => {
     setIsHovered(true);
     const isLastPoint = getCurrentPath().length - 1 === index;
-    if (!isLastPoint) {
+    if (!isLastPoint && routeNumber) {
       setRouteIndexHovered(routeNumber);
     }
   };
@@ -130,13 +139,13 @@ export const Point = ({
   };
   const title = type && <title>{type}</title>;
 
-  if (isOtherSelected && isEditMode)
+  if (isOtherRouteSelected && isEditMode)
     return (
       <g transform={`translate(${x},${y}) scale(${1 / photoZoom.scale})`}>
         <circle cx={0} cy={0} r={2.5 * photoZoom.scale} fill="white" />
       </g>
     );
-  if (!isSelected || !isEditMode) return null;
+  if (!isRouteSelected || !isEditMode) return null;
 
   return (
     <g transform={`translate(${x},${y}) scale(${1 / photoZoom.scale})`}>
diff --git a/src/components/FeaturePanel/Climbing/Editor/RouteFloatingMenu.tsx b/src/components/FeaturePanel/Climbing/Editor/RouteFloatingMenu.tsx
index f913213d3..cd1f78961 100644
--- a/src/components/FeaturePanel/Climbing/Editor/RouteFloatingMenu.tsx
+++ b/src/components/FeaturePanel/Climbing/Editor/RouteFloatingMenu.tsx
@@ -42,6 +42,7 @@ export const RouteFloatingMenu = () => {
     routeSelectedIndex,
     getCurrentPath,
     setRouteIndexHovered,
+    isEditMode,
   } = useClimbingContext();
   const path = getCurrentPath();
   const machine = getMachine();
@@ -51,6 +52,8 @@ export const RouteFloatingMenu = () => {
       routes[routeSelectedIndex] &&
       pointSelectedIndex === getCurrentPath().length - 1) ||
     machine.currentStateName === 'editRoute';
+
+  const areCragPointsVisible = isEditMode;
   const isDoneVisible = machine.currentStateName === 'extendRoute';
   const isUndoVisible =
     machine.currentStateName === 'extendRoute' && path.length !== 0;
@@ -61,6 +64,15 @@ export const RouteFloatingMenu = () => {
   const onContinueClimbingRouteClick = useCallback(() => {
     machine.execute('extendRoute');
   }, [machine]);
+
+  const onMockPointsClick = useCallback(() => {
+    machine.execute('mockPoints');
+  }, [machine]);
+
+  const onMockPointsFinish = () => {
+    machine.execute('editRoute');
+  };
+
   const onDeletePoint = () => {
     machine.execute('deletePoint');
     setIsDeletePointDialogVisible(false);
@@ -72,11 +84,16 @@ export const RouteFloatingMenu = () => {
 
   const onPointTypeChange = useCallback(
     (type: PointType) => {
-      machine.execute('changePointType', { type });
+      // @TODO tady upravit aby se tam posílalo routeSelectedIndex=undefined a pointSelectedIndex podle indexu v mockedPoints. Zároveň bude potřeba sem předat informaci který index měním. Možná v climbing contextu?
+      machine.execute('changePointType', {
+        type,
+        routeSelectedIndex,
+        pointSelectedIndex,
+      });
 
       setShowRouteMarksMenu(false);
     },
-    [machine],
+    [machine, routeSelectedIndex, pointSelectedIndex],
   );
 
   const onMouseEnter = () => {
@@ -117,6 +134,9 @@ export const RouteFloatingMenu = () => {
       if (e.key === 'e') {
         onContinueClimbingRouteClick();
       }
+      if (e.key === 'm') {
+        onMockPointsClick();
+      }
       if (isUndoVisible && e.key === 'z' && e.metaKey) {
         handleUndo(e);
       }
@@ -136,6 +156,7 @@ export const RouteFloatingMenu = () => {
     isUndoVisible,
     onContinueClimbingRouteClick,
     onFinishClimbingRouteClick,
+    onMockPointsClick,
     onPointTypeChange,
   ]);
 
@@ -236,6 +257,14 @@ export const RouteFloatingMenu = () => {
                   Extend
                 </Button>
               )}
+              {areCragPointsVisible &&
+                (machine.currentStateName === 'mockPoints' ? (
+                  <Button onClick={onMockPointsFinish}>
+                    Finish mock points
+                  </Button>
+                ) : (
+                  <Button onClick={onMockPointsClick}>Mock points</Button>
+                ))}
               {machine.currentStateName === 'pointMenu' && (
                 <Button
                   onClick={() => {
diff --git a/src/components/FeaturePanel/Climbing/Editor/RouteMarks.tsx b/src/components/FeaturePanel/Climbing/Editor/RouteMarks.tsx
index 0f3246205..25a3f6df9 100644
--- a/src/components/FeaturePanel/Climbing/Editor/RouteMarks.tsx
+++ b/src/components/FeaturePanel/Climbing/Editor/RouteMarks.tsx
@@ -1,13 +1,7 @@
 import React from 'react';
-import { Bolt } from './Points/Bolt';
-import { Piton } from './Points/Piton';
-import { Point } from './Points/Point';
-import { PulsedPoint } from './Points/PulsedPoint';
-import { Sling } from './Points/Sling';
 import { useClimbingContext } from '../contexts/ClimbingContext';
-import { Anchor } from './Points/Anchor';
 import { ClimbingRoute } from '../types';
-import { UnfinishedPoint } from './Points/UnfinishedPoint';
+import { PointWithType } from './PointWithType';
 
 type Props = {
   route: ClimbingRoute;
@@ -34,6 +28,7 @@ export const RouteMarks = ({
     setIsPointClicked,
     isOtherRouteSelected,
     isEditMode,
+    setRouteIndexHovered,
   } = useClimbingContext();
   const isSelected = isRouteSelected(routeNumber);
   const isOtherSelected = isOtherRouteSelected(routeNumber);
@@ -53,16 +48,8 @@ export const RouteMarks = ({
           }
         };
 
-        const isBoltVisible = !isOtherSelected && type === 'bolt';
-        const isAnchorVisible = !isOtherSelected && type === 'anchor';
-        const isSlingVisible = !isOtherSelected && type === 'sling';
-        const isPitonVisible = !isOtherSelected && type === 'piton';
-        const isUnfinishedPointVisible =
-          !isOtherSelected && type === 'unfinished';
-
         const position = getPixelPosition({ x, y, units: 'percentage' });
-        const isActualPointSelected = isSelected && isPointSelected(index);
-        const pointerEvents = isSelected || isEditMode ? 'auto' : 'none';
+
         const machine = getMachine();
         const isThisRouteEditOrExtendMode =
           (machine.currentStateName === 'extendRoute' ||
@@ -70,66 +57,24 @@ export const RouteMarks = ({
             machine.currentStateName === 'editRoute') &&
           isSelected;
 
-        const xOffset = isSelected && isEditMode ? 15 : 0;
         return (
           // eslint-disable-next-line react/no-array-index-key
-          <React.Fragment key={`${routeNumber}-${index}-${x}-${y}`}>
-            {isThisRouteEditOrExtendMode && <PulsedPoint x={x} y={y} />}
-
-            {isBoltVisible && (
-              <Bolt
-                x={position.x + xOffset}
-                y={position.y}
-                isPointSelected={isActualPointSelected}
-                pointerEvents={pointerEvents}
-                onClick={onMarkedPointClick}
-              />
-            )}
-            {isPitonVisible && (
-              <Piton
-                x={position.x + xOffset}
-                y={position.y}
-                isPointSelected={isActualPointSelected}
-                pointerEvents={pointerEvents}
-                onClick={onMarkedPointClick}
-              />
-            )}
-            {isSlingVisible && (
-              <Sling
-                x={position.x}
-                y={position.y}
-                isPointSelected={isActualPointSelected}
-                pointerEvents={pointerEvents}
-                onClick={onMarkedPointClick}
-              />
-            )}
-            {isAnchorVisible && (
-              <Anchor
-                x={position.x + xOffset}
-                y={position.y}
-                isPointSelected={isActualPointSelected}
-                pointerEvents={pointerEvents}
-                onClick={onMarkedPointClick}
-              />
-            )}
-            {isUnfinishedPointVisible && (
-              <UnfinishedPoint
-                x={position.x + xOffset}
-                y={position.y}
-                isPointSelected={isActualPointSelected}
-                pointerEvents={pointerEvents}
-                onClick={onMarkedPointClick}
-              />
-            )}
-            <Point
-              x={position.x}
-              y={position.y}
-              type={type}
-              onPointInSelectedRouteClick={onPointInSelectedRouteClick}
-              index={index}
-              routeNumber={routeNumber}
-            />
-          </React.Fragment>
+          <PointWithType
+            key={`${routeNumber}-${index}-${x}-${y}`}
+            isOtherRouteSelected={isOtherSelected}
+            isRouteSelected={isSelected}
+            isPointSelected={isRouteSelected && isPointSelected(index)}
+            isWithOffset={isSelected && isEditMode}
+            isPulsing={isThisRouteEditOrExtendMode}
+            onMarkedPointClick={onMarkedPointClick}
+            x={position.x}
+            y={position.y}
+            isEditMode={isEditMode}
+            type={type}
+            onPointClick={onPointInSelectedRouteClick}
+            pointIndex={index}
+            routeNumber={routeNumber}
+          />
         );
       })}
     </>
diff --git a/src/components/FeaturePanel/Climbing/Editor/RoutesEditor.tsx b/src/components/FeaturePanel/Climbing/Editor/RoutesEditor.tsx
index 158a22e6d..ccd7d5a1c 100644
--- a/src/components/FeaturePanel/Climbing/Editor/RoutesEditor.tsx
+++ b/src/components/FeaturePanel/Climbing/Editor/RoutesEditor.tsx
@@ -81,6 +81,11 @@ export const RoutesEditor = ({
       });
       return;
     }
+    if (machine.currentStateName === 'mockPoints') {
+      machine.execute('addMockedPoint', {
+        position: { x: e.clientX, y: e.clientY },
+      });
+    }
 
     if (machine.currentStateName === 'pointMenu') {
       machine.execute('cancelPointMenu');
diff --git a/src/components/FeaturePanel/Climbing/Editor/RoutesLayer.tsx b/src/components/FeaturePanel/Climbing/Editor/RoutesLayer.tsx
index a844307ba..4631c4440 100644
--- a/src/components/FeaturePanel/Climbing/Editor/RoutesLayer.tsx
+++ b/src/components/FeaturePanel/Climbing/Editor/RoutesLayer.tsx
@@ -7,6 +7,7 @@ import { RouteFloatingMenu } from './RouteFloatingMenu';
 import { RouteMarks } from './RouteMarks';
 import { getMouseFromPositionInImage } from '../utils/mousePositionUtils';
 import { DIALOG_TOP_BAR_HEIGHT } from '../config';
+import { MockedPoints } from './MockedPoints';
 
 type RouteRenders = { route: React.ReactNode; marks: React.ReactNode };
 
@@ -184,6 +185,8 @@ export const RoutesLayer = ({
       {sortedRoutes.selected.map((item) => item.marks)}
       {sortedRoutes.hovered.map((item) => item.route)}
       {sortedRoutes.hovered.map((item) => item.marks)}
+
+      <MockedPoints />
     </Svg>
   );
 };
diff --git a/src/components/FeaturePanel/Climbing/Editor/StartPoint.tsx b/src/components/FeaturePanel/Climbing/Editor/StartPoint.tsx
index 3e7083332..e625d6af0 100644
--- a/src/components/FeaturePanel/Climbing/Editor/StartPoint.tsx
+++ b/src/components/FeaturePanel/Climbing/Editor/StartPoint.tsx
@@ -48,8 +48,10 @@ export const StartPoint = ({
   osmId,
   onPointInSelectedRouteClick,
 }: Props) => {
-  const { isRouteSelected, getMachine } = useClimbingContext();
+  const { isRouteSelected, getMachine, isOtherRouteSelected } =
+    useClimbingContext();
   const isSelected = isRouteSelected(routeNumber);
+  const isOtherSelected = isOtherRouteSelected(routeNumber);
   const machine = getMachine();
   return (
     <>
@@ -63,6 +65,8 @@ export const StartPoint = ({
           index={0}
           routeNumber={routeNumber}
           type={undefined}
+          isRouteSelected={isSelected}
+          isOtherRouteSelected={isOtherSelected}
         />
       ) : (
         <NonEditablePoint isSelected={isSelected} x={x} y={y} />
diff --git a/src/components/FeaturePanel/Climbing/contexts/ClimbingContext.tsx b/src/components/FeaturePanel/Climbing/contexts/ClimbingContext.tsx
index 9823140f9..ff5dd99fb 100644
--- a/src/components/FeaturePanel/Climbing/contexts/ClimbingContext.tsx
+++ b/src/components/FeaturePanel/Climbing/contexts/ClimbingContext.tsx
@@ -124,6 +124,8 @@ type ClimbingContextType = {
     routeIndex: number,
     routeListTopOffset: number,
   ) => void;
+  mockedPoints: PathPoints;
+  setMockedPoints: (mockedPoints: PathPoints) => void;
 };
 
 // @TODO generate?
@@ -166,6 +168,7 @@ export const ClimbingContextProvider = ({ children, feature }: Props) => {
   const [mousePosition, setMousePosition] = useState<PositionPx | null>(null);
   const [filterDifficulty, setFilterDifficulty] = useState<Array<string>>([]);
   const [routeIndexExpanded, setRouteIndexExpanded] = useState<number>(null);
+  const [mockedPoints, setMockedPoints] = useState<PathPoints>([]);
   const [editorPosition, setEditorPosition] = useState<PositionPx>({
     x: 0,
     y: 0,
@@ -275,6 +278,8 @@ export const ClimbingContextProvider = ({ children, feature }: Props) => {
     findCloserPoint,
     svgRef,
     photoZoom,
+    mockedPoints,
+    setMockedPoints,
   });
 
   const isRouteSelected = (index: number) => routeSelectedIndex === index;
@@ -389,6 +394,8 @@ export const ClimbingContextProvider = ({ children, feature }: Props) => {
     setLoadedPhotos,
     routeListTopOffsets,
     setRouteListTopOffset,
+    mockedPoints,
+    setMockedPoints,
   };
 
   return (
diff --git a/src/components/FeaturePanel/Climbing/utils/useGetMachineFactory.ts b/src/components/FeaturePanel/Climbing/utils/useGetMachineFactory.ts
index 4fd5fc4e0..01d7caaee 100644
--- a/src/components/FeaturePanel/Climbing/utils/useGetMachineFactory.ts
+++ b/src/components/FeaturePanel/Climbing/utils/useGetMachineFactory.ts
@@ -5,6 +5,7 @@ import { getPositionInImageFromMouse } from './mousePositionUtils';
 
 export type State =
   | 'editRoute'
+  | 'mockPoints'
   | 'extendRoute'
   | 'init'
   | 'pointMenu'
@@ -22,6 +23,8 @@ export type StateAction =
   | 'dragPoint'
   | 'editRoute'
   | 'extendRoute'
+  | 'mockPoints'
+  | 'addMockedPoint'
   | 'finishRoute'
   | 'routeSelect'
   | 'showPointMenu'
@@ -51,6 +54,8 @@ export const useGetMachineFactory = ({
   findCloserPoint,
   svgRef,
   photoZoom,
+  mockedPoints,
+  setMockedPoints,
 }) => {
   const [currentState, setCurrentState] = useState<State>('init');
 
@@ -109,14 +114,43 @@ export const useGetMachineFactory = ({
   };
 
   const dragPoint = () => {};
+  const mockPoints = () => {};
 
-  const changePointType = ({ type }) => {
-    updatePathOnRouteIndex(routeSelectedIndex, (path) =>
-      updateElementOnIndex(path, pointSelectedIndex, (point) => ({
+  const addMockedPoint = (props: { position: PositionPx }) => {
+    if (!props) return;
+    const positionInImage = getPositionInImageFromMouse(
+      svgRef,
+      props.position,
+      photoZoom,
+    );
+
+    const newCoordinate = getPercentagePosition(positionInImage);
+
+    const closestPoint = findCloserPoint(newCoordinate);
+
+    setMockedPoints([...mockedPoints, closestPoint ?? newCoordinate]);
+  };
+
+  const finishMockPoints = () => {};
+
+  const changePointType = ({
+    type,
+    routeSelectedIndex,
+    pointSelectedIndex,
+  }) => {
+    if (routeSelectedIndex) {
+      updatePathOnRouteIndex(routeSelectedIndex, (path) =>
+        updateElementOnIndex(path, pointSelectedIndex, (point) => ({
+          ...point,
+          type,
+        })),
+      );
+    } else {
+      updateElementOnIndex(mockedPoints, pointSelectedIndex, (point) => ({
         ...point,
         type,
-      })),
-    );
+      }));
+    }
   };
 
   const addPointInBetween = ({ hoveredPosition, hoveredSegmentIndex }) => {
@@ -157,11 +191,13 @@ export const useGetMachineFactory = ({
       ...commonActions,
       extendRoute: { nextState: 'extendRoute', callback: extendRoute },
       routeSelect: { nextState: 'routeSelected', callback: routeSelect },
+      mockPoints: { nextState: 'mockPoints', callback: mockPoints },
     },
     editRoute: {
       ...commonActions,
       deleteRoute: { nextState: 'init', callback: deleteRoute },
       dragPoint: { nextState: 'editRoute', callback: dragPoint },
+      mockPoints: { nextState: 'mockPoints', callback: mockPoints },
       cancelRouteSelection: {
         nextState: 'init',
         callback: cancelRouteSelection,
@@ -175,6 +211,11 @@ export const useGetMachineFactory = ({
       extendRoute: { nextState: 'extendRoute', callback: extendRoute },
       routeSelect: { nextState: 'routeSelected', callback: routeSelect },
     },
+    mockPoints: {
+      editRoute: { nextState: 'editRoute', callback: finishMockPoints },
+      addMockedPoint: { nextState: 'mockPoints', callback: addMockedPoint },
+      showPointMenu: { nextState: 'pointMenu' },
+    },
     extendRoute: {
       ...commonActions,
       deleteRoute: { nextState: 'init', callback: deleteRoute },
@@ -215,7 +256,9 @@ export const useGetMachineFactory = ({
     currentState: states[currentState],
     currentStateName: currentState,
     execute: (desiredAction: StateAction, props?: unknown) => {
+      console.log('___desiredAction', currentState, desiredAction);
       if (desiredAction in states[currentState]) {
+        console.log('___desiredAction OK', desiredAction);
         const { nextState, callback } = states[currentState][desiredAction];
         setCurrentState(nextState);
         if (callback) callback(props);
diff --git a/src/services/types.ts b/src/services/types.ts
index b996787ca..7e24f73ee 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -19,6 +19,7 @@ export type ImageDefFromTag = {
   v: string;
   instant: boolean; // true = no API call needed
   path?: PathType;
+  // TODO: points
   memberPaths?: MemberPath[]; // merged on relation
 };
 export type ImageDefFromCenter = {