diff --git a/packages/tldraw/src/components/ToolButton/ToolButton.tsx b/packages/tldraw/src/components/ToolButton/ToolButton.tsx
index 7eeefe4ed..f61315bf1 100644
--- a/packages/tldraw/src/components/ToolButton/ToolButton.tsx
+++ b/packages/tldraw/src/components/ToolButton/ToolButton.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react'
 import { breakpoints } from '~components/breakpoints'
 import { Tooltip } from '~components/Tooltip'
+import { useTLDrawContext } from '~hooks'
 import { styled } from '~styles'
 
 export interface ToolButtonProps {
@@ -39,9 +40,16 @@ interface ToolButtonWithTooltipProps extends ToolButtonProps {
 }
 
 export function ToolButtonWithTooltip({ label, kbd, ...rest }: ToolButtonWithTooltipProps) {
+  const { state } = useTLDrawContext()
+
+  const handleDoubleClick = React.useCallback(() => {
+    console.log('double clicking')
+    state.toggleToolLock()
+  }, [])
+
   return (
     <Tooltip label={label[0].toUpperCase() + label.slice(1)} kbd={kbd}>
-      <ToolButton variant="primary" {...rest} />
+      <ToolButton {...rest} variant="primary" onDoubleClick={handleDoubleClick} />
     </Tooltip>
   )
 }
diff --git a/packages/tldraw/src/components/ToolsPanel/ActionButton.tsx b/packages/tldraw/src/components/ToolsPanel/ActionButton.tsx
index 4aec1cb51..11e448571 100644
--- a/packages/tldraw/src/components/ToolsPanel/ActionButton.tsx
+++ b/packages/tldraw/src/components/ToolsPanel/ActionButton.tsx
@@ -200,7 +200,10 @@ export function ActionButton(): JSX.Element {
                 <AspectRatioIcon opacity={isAllAspectLocked ? 1 : 0.4} />
               </Tooltip>
             </IconButton>
-            <IconButton disabled={!isAllGrouped && !hasMultipleSelection} onClick={handleGroup}>
+            <IconButton
+              disabled={!hasSelection || (!isAllGrouped && !hasMultipleSelection)}
+              onClick={handleGroup}
+            >
               <Tooltip label="Group" kbd={`#G`}>
                 <GroupIcon opacity={isAllGrouped ? 1 : 0.4} />
               </Tooltip>
@@ -212,7 +215,6 @@ export function ActionButton(): JSX.Element {
                 <PinBottomIcon />
               </Tooltip>
             </IconButton>
-
             <IconButton disabled={!hasSelection} onClick={handleMoveBackward}>
               <Tooltip label="Move Backward" kbd={`#[`}>
                 <ArrowDownIcon />
diff --git a/packages/tldraw/src/components/ToolsPanel/DeleteButton.tsx b/packages/tldraw/src/components/ToolsPanel/DeleteButton.tsx
new file mode 100644
index 000000000..1be2aea6d
--- /dev/null
+++ b/packages/tldraw/src/components/ToolsPanel/DeleteButton.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react'
+import { Tooltip } from '~components/Tooltip'
+import { useTLDrawContext } from '~hooks'
+import { ToolButton } from '~components/ToolButton'
+import { TrashIcon } from '~components/icons'
+
+export function DeleteButton(): JSX.Element {
+  const { state } = useTLDrawContext()
+
+  const handleDelete = React.useCallback(() => {
+    state.delete()
+  }, [state])
+
+  return (
+    <Tooltip label="Delete" kbd="7">
+      <ToolButton variant="circle" onSelect={handleDelete}>
+        <TrashIcon />
+      </ToolButton>
+    </Tooltip>
+  )
+}
diff --git a/packages/tldraw/src/components/ToolsPanel/ToolsPanel.tsx b/packages/tldraw/src/components/ToolsPanel/ToolsPanel.tsx
index 14742f490..829c59c3c 100644
--- a/packages/tldraw/src/components/ToolsPanel/ToolsPanel.tsx
+++ b/packages/tldraw/src/components/ToolsPanel/ToolsPanel.tsx
@@ -7,6 +7,7 @@ import { BackToContent } from './BackToContent'
 import { PrimaryTools } from './PrimaryTools'
 import { ActionButton } from './ActionButton'
 import { LockButton } from './LockButton'
+import { DeleteButton } from './DeleteButton'
 
 const isDebugModeSelector = (s: TLDrawSnapshot) => s.settings.isDebugMode
 
@@ -22,7 +23,7 @@ export const ToolsPanel = React.memo(function ToolsPanel(): JSX.Element {
         <StyledPrimaryTools>
           <ActionButton />
           <PrimaryTools />
-          <LockButton />
+          <DeleteButton />
         </StyledPrimaryTools>
       </StyledCenterWrap>
       {isDebugMode && (
diff --git a/packages/tldraw/src/state/TLDrawState.ts b/packages/tldraw/src/state/TLDrawState.ts
index 6c8617687..f8f903cf2 100644
--- a/packages/tldraw/src/state/TLDrawState.ts
+++ b/packages/tldraw/src/state/TLDrawState.ts
@@ -38,6 +38,7 @@ import {
   SessionType,
   ExceptFirst,
   ExceptFirstTwo,
+  TLDrawToolType,
 } from '~types'
 import {
   migrate,
@@ -51,7 +52,7 @@ import { shapeUtils } from '~state/shapes'
 import { defaultStyle } from '~state/shapes/shape-styles'
 import * as Commands from './commands'
 import { ArgsOfType, getSession } from './sessions'
-import { createTools, ToolType } from './tools'
+import { createTools } from './tools'
 import type { BaseTool } from './tools/BaseTool'
 import { USER_COLORS, FIT_TO_SCREEN_PADDING } from '~constants'
 
@@ -642,12 +643,21 @@ export class TLDrawState extends StateManager<TLDrawSnapshot> {
    * Select a tool.
    * @param tool The tool to select, or "select".
    */
-  selectTool = (type: ToolType): this => {
+  selectTool = (type: TLDrawToolType): this => {
     if (this.readOnly || this.session) return this
 
     const tool = this.tools[type]
 
-    if (tool === this.currentTool) return this
+    if (tool === this.currentTool) {
+      console.log('hi')
+
+      this.patchState({
+        appState: {
+          isToolLocked: false,
+        },
+      })
+      return this
+    }
 
     this.currentTool.onExit()
 
@@ -659,6 +669,7 @@ export class TLDrawState extends StateManager<TLDrawSnapshot> {
       {
         appState: {
           activeTool: type,
+          isToolLocked: false,
         },
       },
       `selected_tool:${type}`
diff --git a/packages/tldraw/src/state/tools/BaseTool/BaseTool.ts b/packages/tldraw/src/state/tools/BaseTool/BaseTool.ts
index 57d230eb8..52b56d8bc 100644
--- a/packages/tldraw/src/state/tools/BaseTool/BaseTool.ts
+++ b/packages/tldraw/src/state/tools/BaseTool/BaseTool.ts
@@ -12,7 +12,6 @@ import {
   Utils,
 } from '@tldraw/core'
 import type { TLDrawState } from '~state'
-import type { TLDrawShapeType } from '~types'
 
 export enum Status {
   Idle = 'idle',
@@ -22,8 +21,6 @@ export enum Status {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export abstract class BaseTool<T extends string = any> {
-  abstract type: TLDrawShapeType | 'select'
-
   state: TLDrawState
 
   status: Status | T = Status.Idle
diff --git a/packages/tldraw/src/state/tools/index.ts b/packages/tldraw/src/state/tools/index.ts
index 6cc898aca..d96b19f5a 100644
--- a/packages/tldraw/src/state/tools/index.ts
+++ b/packages/tldraw/src/state/tools/index.ts
@@ -1,5 +1,6 @@
 import type { TLDrawState } from '~state'
-import { TLDrawShapeType } from '~types'
+import { TLDrawShapeType, TLDrawToolType } from '~types'
+import type { BaseTool } from './BaseTool'
 import { ArrowTool } from './ArrowTool'
 import { DrawTool } from './DrawTool'
 import { EllipseTool } from './EllipseTool'
@@ -8,15 +9,6 @@ import { SelectTool } from './SelectTool'
 import { StickyTool } from './StickyTool'
 import { TextTool } from './TextTool'
 
-export type ToolType =
-  | 'select'
-  | TLDrawShapeType.Text
-  | TLDrawShapeType.Draw
-  | TLDrawShapeType.Ellipse
-  | TLDrawShapeType.Rectangle
-  | TLDrawShapeType.Arrow
-  | TLDrawShapeType.Sticky
-
 export interface ToolsMap {
   select: typeof SelectTool
   [TLDrawShapeType.Text]: typeof TextTool
@@ -27,11 +19,11 @@ export interface ToolsMap {
   [TLDrawShapeType.Sticky]: typeof StickyTool
 }
 
-export type ToolOfType<K extends ToolType> = ToolsMap[K]
+export type ToolOfType<K extends TLDrawToolType> = ToolsMap[K]
 
-export type ArgsOfType<K extends ToolType> = ConstructorParameters<ToolOfType<K>>
+export type ArgsOfType<K extends TLDrawToolType> = ConstructorParameters<ToolOfType<K>>
 
-export const tools: { [K in ToolType]: ToolsMap[K] } = {
+export const tools: { [K in TLDrawToolType]: ToolsMap[K] } = {
   select: SelectTool,
   [TLDrawShapeType.Text]: TextTool,
   [TLDrawShapeType.Draw]: DrawTool,
@@ -41,11 +33,11 @@ export const tools: { [K in ToolType]: ToolsMap[K] } = {
   [TLDrawShapeType.Sticky]: StickyTool,
 }
 
-export const getTool = <K extends ToolType>(type: K): ToolOfType<K> => {
+export const getTool = <K extends TLDrawToolType>(type: K): ToolOfType<K> => {
   return tools[type]
 }
 
-export function createTools(state: TLDrawState) {
+export function createTools(state: TLDrawState): Record<TLDrawToolType, BaseTool> {
   return {
     select: new SelectTool(state),
     [TLDrawShapeType.Text]: new TextTool(state),
diff --git a/packages/tldraw/src/types.ts b/packages/tldraw/src/types.ts
index f1c920903..ac7e94420 100644
--- a/packages/tldraw/src/types.ts
+++ b/packages/tldraw/src/types.ts
@@ -401,6 +401,15 @@ export type Easing =
   | 'easeOutExpo'
   | 'easeInOutExpo'
 
+export type TLDrawToolType =
+  | 'select'
+  | TLDrawShapeType.Text
+  | TLDrawShapeType.Draw
+  | TLDrawShapeType.Ellipse
+  | TLDrawShapeType.Rectangle
+  | TLDrawShapeType.Arrow
+  | TLDrawShapeType.Sticky
+
 /* ------------------- File System ------------------ */
 
 export interface TLDrawFile {
diff --git a/www/components/editor.tsx b/www/components/editor.tsx
index 53abb4d3d..32ecb20f3 100644
--- a/www/components/editor.tsx
+++ b/www/components/editor.tsx
@@ -1,4 +1,5 @@
 import { TLDraw, TLDrawState, useFileSystem } from '@tldraw/tldraw'
+import { signIn, signOut } from 'next-auth/client'
 import * as gtag from '-utils/gtag'
 import React from 'react'
 
@@ -26,13 +27,23 @@ export default function Editor({ id = 'home' }: EditorProps) {
 
   const fileSystemEvents = useFileSystem()
 
+  const handleSignIn = React.useCallback(() => {
+    signIn()
+  }, [])
+
+  const handleSignOut = React.useCallback(() => {
+    signOut()
+  }, [])
+
   return (
     <div className="tldraw">
       <TLDraw
         id={id}
+        autofocus
         onMount={handleMount}
         onPersist={handlePersist}
-        autofocus
+        onSignIn={handleSignIn}
+        onSignOut={handleSignOut}
         {...fileSystemEvents}
       />
     </div>