diff --git a/src/diagram/Canvas.tsx b/src/diagram/Canvas.tsx
index f94aeac..f04206a 100644
--- a/src/diagram/Canvas.tsx
+++ b/src/diagram/Canvas.tsx
@@ -364,7 +364,6 @@ export const Canvas = ({ children, width, height }) => {
 
 	return (
 		<div className="app-wrap">
-			<div ref={refContainer} className="app-content" />
 			{graphStore.graph
 				? <graphContext.Provider value={graphStore}>
 					<layoutContext.Provider value={layoutStore}>
@@ -373,6 +372,7 @@ export const Canvas = ({ children, width, height }) => {
 				</graphContext.Provider>
 				: <></>
 			}
+			<div ref={refContainer} className="app-content" />
 		</div>
 	);
 }
\ No newline at end of file
diff --git a/src/diagram/Graph.tsx b/src/diagram/Graph.tsx
index 38b4736..1dc48c2 100644
--- a/src/diagram/Graph.tsx
+++ b/src/diagram/Graph.tsx
@@ -1,5 +1,5 @@
 
-import React, { Component } from "react";
+import React from "react";
 import { observer } from "mobx-react-lite";
 import { v4 as uuidv4 } from 'uuid';
 
@@ -9,6 +9,7 @@ import { NodeField } from "./visual_components/NodeField";
 import { NodeBox } from "./NodeBox"
 import { EdgeBox } from "./EdgeBox";
 import { Canvas } from "./Canvas"
+import { Stencil } from "./Stencil"
 
 const graphWidth = 800;
 const graphHeight = 600;
@@ -173,6 +174,43 @@ export const Graph = (props: any) => {
 
 	const shapes = [...props.data.shapes, ...props.data.properties];
 
+	const render_stencil = () => {
+		const nodeShape = {
+			id: "Node Shape",
+			size: { width: 140, height: 40 },
+			zIndex: 0,
+			shape: "group",
+			component(_) {
+				return <NodeShape text={"Node Shape"} />;
+			},
+		};
+		const nodeField = {
+			id: "Node Field",
+			size: { width: 140, height: 40 },
+			zIndex: 2,
+			shape: "field",
+			component(_) {
+				return <NodeField text={"Node Field"} />;
+			},
+		};
+		const nodeCircle = {
+			id: "Node Circle",
+			size: { width: 80, height: 80 },
+			zIndex: 0,
+			shape: "circle",
+			label: "Node Circle",
+			attrs: {
+				body: {
+					fill: '#efdbff',
+					stroke: '#9254de',
+				},
+			},
+		};
+		return class_diagram
+			? <Stencil nodes={[nodeField, nodeShape]} />
+			: <Stencil nodes={[nodeCircle]} />;
+	};
+
 	const render_children = () => {
 		if (class_diagram) {
 			return shapes.map(shape =>
@@ -188,6 +226,7 @@ export const Graph = (props: any) => {
 		<div>
 			<button onClick={() => set_class_diagram(!class_diagram)}> Switch! </button>
 			<Canvas width={graphWidth} height={graphHeight}>
+				{render_stencil()}
 				{render_children()}
 			</Canvas>
 		</div>
diff --git a/src/diagram/Stencil.tsx b/src/diagram/Stencil.tsx
new file mode 100644
index 0000000..179b5a6
--- /dev/null
+++ b/src/diagram/Stencil.tsx
@@ -0,0 +1,47 @@
+
+import React from "react";
+import { Addon } from "@antv/x6";
+
+import { graphContext } from "./Canvas"
+
+import { NodeShape } from "./visual_components/NodeShape";
+import { NodeField } from "./visual_components/NodeField";
+import { ReactShape } from "@antv/x6-react-shape";
+
+export const Stencil = ({nodes = []}: any) => {
+
+	const refContainer = React.useRef<any>();
+	const graphStore = React.useContext(graphContext);
+	const [stencil, set_stencil] = React.useState<any>();
+
+	React.useEffect(() => {
+		const s = new Addon.Stencil({
+			title: "Stencil",
+			target: graphStore.graph,
+			collapsable: true,
+			stencilGraphWidth: 300,
+			stencilGraphHeight: 180,
+			layoutOptions: {
+				columns: 1,
+			},
+			groups: [
+				{
+					name: "group1",
+					title: "Components",
+				},
+			],
+		});
+		set_stencil(s);
+		
+		refContainer.current.appendChild(s.container);
+	}, [graphStore.graph]);
+
+	React.useEffect(() => {
+		if (stencil) {
+			stencil.load(nodes, "group1");
+		}
+	}, [nodes, stencil]);
+
+
+	return <div ref={refContainer} className="app-stencil" />;
+}