diff --git a/src/api/match-info/create-event-match.ts b/src/api/match-info/create-event-match.ts
index dc73ae5b3..2ad59e859 100644
--- a/src/api/match-info/create-event-match.ts
+++ b/src/api/match-info/create-event-match.ts
@@ -8,4 +8,4 @@ export const createEventMatch = (
     // UTC Date - scheduled match time
     time: string
   },
-) => request<null>('POST', `events/${eventKey}/matches`, {}, match)
+) => request<null>('PUT', `events/${eventKey}/matches/${match.key}`, {}, match)
diff --git a/src/components/event-matches.tsx b/src/components/event-matches.tsx
index 89814700d..50fc63847 100644
--- a/src/components/event-matches.tsx
+++ b/src/components/event-matches.tsx
@@ -9,6 +9,7 @@ import { formatMatchKey } from '@/utils/format-match-key'
 interface Props {
   matches: ProcessedMatchInfo[]
   eventKey: string
+  isAdmin?: boolean
 }
 
 const searchTextStyles = css`
@@ -28,7 +29,7 @@ const enum QueryRank {
   MatchExact,
 }
 
-export const EventMatches = ({ matches, eventKey }: Props) => {
+export const EventMatches = ({ matches, eventKey, isAdmin }: Props) => {
   const [searchQuery, setSearchQuery] = useState<string>('')
   const s = searchQuery.trim().toLowerCase()
 
@@ -80,7 +81,13 @@ export const EventMatches = ({ matches, eventKey }: Props) => {
       />
       <div class={matchListStyle}>
         {filteredMatches.map((m) => (
-          <MatchDetailsCard eventKey={eventKey} match={m} key={m.key} link />
+          <MatchDetailsCard
+            eventKey={eventKey}
+            match={m}
+            key={m.key}
+            link
+            isAdmin={isAdmin}
+          />
         ))}
       </div>
     </>
diff --git a/src/components/match-card.tsx b/src/components/match-card.tsx
index 31c59eb4a..d81cf7d99 100644
--- a/src/components/match-card.tsx
+++ b/src/components/match-card.tsx
@@ -5,6 +5,8 @@ import Card from '@/components/card'
 import { css } from '@linaria/core'
 import { memo } from '@/utils/memo'
 import clsx from 'clsx'
+import IconButton from './icon-button'
+import { mdiPencil } from '@mdi/js'
 
 interface MatchCardProps {
   match: {
@@ -17,13 +19,14 @@ interface MatchCardProps {
   eventKey: string
   link?: boolean
   class?: string
+  isAdmin?: boolean
 }
 
 const matchCardStyle = css`
   font-size: 0.93rem;
   align-items: center;
   display: grid;
-  grid-template-columns: auto auto 10rem;
+  grid-template-columns: auto auto auto 10rem;
   overflow: hidden;
   text-decoration: none;
 
@@ -40,13 +43,21 @@ const matchCardStyle = css`
 const matchTitleStyle = css`
   font-weight: bold;
   grid-row: span 2;
+  grid-column: 1;
   white-space: nowrap;
-  margin: 0.3rem 0.6rem;
+  margin: 0.3rem 0rem 0.3rem 0.6rem;
+  align-items: center;
+
   & > * {
     margin: 0.3rem 0;
   }
 `
 
+const pencilStyle = css`
+  grid-column: 2;
+  grid-row: span 2;
+`
+
 const matchNumStyle = css`
   grid-row: 2;
   text-transform: uppercase;
@@ -58,7 +69,7 @@ const matchNumStyle = css`
 
 const allianceStyle = css`
   white-space: nowrap;
-  grid-column: 3;
+  grid-column: 4;
   align-self: stretch;
   margin-left: 0.3rem;
   padding: 0.35rem 0.8rem;
@@ -82,8 +93,13 @@ const blueStyle = css`
   background-color: var(--alliance-blue);
 `
 
+const pencilIconStyle = css`
+  width: 1rem;
+  aspect-ratio: 1;
+`
+
 export const MatchDetailsCard = memo(
-  ({ match, eventKey, link, class: className }: MatchCardProps) => {
+  ({ match, eventKey, link, class: className, isAdmin }: MatchCardProps) => {
     const matchName = formatMatchKey(match.key)
 
     const createTeamLinks = (teams: string[]) =>
@@ -111,6 +127,15 @@ export const MatchDetailsCard = memo(
             <div class={matchNumStyle}>{`Match ${matchName.num}`}</div>
           )}
         </div>
+        <div class={pencilStyle}>
+          {isAdmin && (
+            <IconButton
+              icon={mdiPencil}
+              href={`/events/${eventKey}/matches/${match.key}/editor`}
+              class={pencilIconStyle}
+            />
+          )}
+        </div>
         {match.time && (
           <time dateTime={match.time.toISOString()}>
             {formatTime(match.time)}
diff --git a/src/routes.ts b/src/routes.ts
index 231381335..5634e86b2 100644
--- a/src/routes.ts
+++ b/src/routes.ts
@@ -19,6 +19,14 @@ const routes = [
     path: '/events/:eventKey/matches/:matchKey/scout',
     component: () => import('./routes/scout'),
   },
+  {
+    path: '/events/:eventKey/match-creator',
+    component: () => import('./routes/match-creator'),
+  },
+  {
+    path: '/events/:eventKey/matches/:matchKey/editor',
+    component: () => import('./routes/match-editor'),
+  },
   {
     path: '/events/:eventKey/teams/:teamNum',
     component: () => import('./routes/event-team'),
diff --git a/src/routes/event-match.tsx b/src/routes/event-match.tsx
index d0295546d..29aff1d62 100644
--- a/src/routes/event-match.tsx
+++ b/src/routes/event-match.tsx
@@ -29,6 +29,7 @@ import {
   ConnectionType,
   useNetworkConnection,
 } from '@/utils/use-network-connection'
+import { useJWT } from '@/jwt'
 
 interface Props {
   eventKey: string
@@ -160,6 +161,10 @@ const EventMatch = ({ eventKey, matchKey }: Props) => {
     }
   }, [match, isOnline])
 
+  const { jwt } = useJWT()
+  const isAdmin =
+    jwt && (jwt.peregrineRoles.isAdmin || jwt.peregrineRoles.isSuperAdmin)
+
   return (
     // page setup
     <Page
@@ -211,7 +216,11 @@ const EventMatch = ({ eventKey, matchKey }: Props) => {
                 </div>
               </Card>
             )}
-            <MatchDetailsCard match={match} eventKey={eventKey} />
+            <MatchDetailsCard
+              match={match}
+              eventKey={eventKey}
+              isAdmin={isAdmin || false}
+            />
             {reports && reports.length > 0 ? (
               <MatchReports
                 match={match}
diff --git a/src/routes/event.tsx b/src/routes/event.tsx
index f95acce77..183cd9c38 100644
--- a/src/routes/event.tsx
+++ b/src/routes/event.tsx
@@ -9,6 +9,7 @@ import { Heading } from '@/components/heading'
 import { EventMatches } from '@/components/event-matches'
 import Loader from '@/components/loader'
 import { useEventMatches } from '@/cache/event-matches/use'
+import { useJWT } from '@/jwt'
 
 interface Props {
   eventKey: string
@@ -52,6 +53,9 @@ const Event = ({ eventKey }: Props) => {
   const matches = useEventMatches(eventKey)
   const eventInfo = useEventInfo(eventKey)
   const newestIncompleteMatch = matches && nextIncompleteMatch(matches)
+  const { jwt } = useJWT()
+  const isAdmin =
+    jwt && (jwt.peregrineRoles.isAdmin || jwt.peregrineRoles.isSuperAdmin)
 
   return (
     <Page
@@ -65,6 +69,11 @@ const Event = ({ eventKey }: Props) => {
         </Heading>
         {eventInfo && <EventInfoCard event={eventInfo} />}
         <Button href={`/events/${eventKey}/analysis`}>Analysis</Button>
+        {isAdmin && (
+          <Button href={`/events/${eventKey}/match-creator`}>
+            Create New Match
+          </Button>
+        )}
       </div>
 
       <div class={sectionStyle}>
@@ -77,11 +86,16 @@ const Event = ({ eventKey }: Props) => {
             match={newestIncompleteMatch}
             eventKey={eventKey}
             link
+            isAdmin={isAdmin || false}
           />
         )}
         {matches ? (
           matches.length > 0 ? (
-            <EventMatches matches={matches} eventKey={eventKey} />
+            <EventMatches
+              matches={matches}
+              eventKey={eventKey}
+              isAdmin={isAdmin || false}
+            />
           ) : (
             <p class={noMatchesStyle}>No matches yet</p>
           )
diff --git a/src/routes/match-creator.tsx b/src/routes/match-creator.tsx
new file mode 100644
index 000000000..7c68e1230
--- /dev/null
+++ b/src/routes/match-creator.tsx
@@ -0,0 +1,111 @@
+import { createEventMatch } from '@/api/match-info/create-event-match'
+import Button from '@/components/button'
+import Card from '@/components/card'
+import { useErrorEmitter, ErrorBoundary } from '@/components/error-boundary'
+import { Form } from '@/components/form'
+import Page from '@/components/page'
+import TextInput from '@/components/text-input'
+import { route } from '@/router'
+import {
+  formatDate,
+  formatTime,
+  getTimeFromParts,
+} from '@/utils/get-time-from-parts'
+import { css } from '@linaria/core'
+import { useState } from 'preact/hooks'
+
+const cardStyle = css`
+  margin: 1.5rem;
+  padding: 1.5rem 2rem;
+  width: 20rem;
+  margin-left: auto;
+  margin-right: auto;
+  & > * {
+    margin-left: 0;
+    margin-right: 0;
+  }
+`
+
+const CreatorForm = ({ eventKey }: { eventKey: string }) => {
+  const [isLoading, setIsLoading] = useState(false)
+  const [matchNumber, setMatchNumber] = useState('')
+  const [day, setDay] = useState('')
+  const [time, setTime] = useState('')
+  const [redScore, setRedScore] = useState(0)
+  const [blueScore, setBlueScore] = useState(0)
+  const [teamList, setTeamList] = useState([''])
+  const emitError = useErrorEmitter()
+
+  const onSubmit = (e: Event) => {
+    e.preventDefault()
+    setIsLoading(true)
+    createEventMatch(eventKey, {
+      redAlliance: teamList.slice(0, 3),
+      blueAlliance: teamList.slice(3, 6),
+      time: getTimeFromParts(day, time),
+      redScore,
+      blueScore,
+      key: `qm${matchNumber}`,
+    })
+      .then(() => route(`/events/${eventKey}/matches/qm${matchNumber}`))
+      .catch(emitError)
+      .finally(() => setIsLoading(false))
+  }
+
+  return (
+    <Form onSubmit={onSubmit}>
+      {(isValid) => (
+        <>
+          <TextInput label="Match Number" onInput={setMatchNumber} required />
+          <TextInput
+            label="Date (in mm/dd format) or leave blank for today"
+            onInput={setDay}
+            placeholder={formatDate(new Date(Date.now()))}
+          />
+          <TextInput
+            label="Time (in hh:mm format) or leave blank for current time"
+            onInput={setTime}
+            placeholder={formatTime(new Date(Date.now()))}
+          />
+          <TextInput
+            label="Teams (separate numbers with commas, red alliance first)"
+            required
+            onInput={(input) => {
+              const teams = input.split(', ')
+              for (let i = 0; i < teams.length; i++) {
+                teams[i] = 'frc' + teams[i]
+              }
+              setTeamList(teams)
+            }}
+            placeholder="Red1, Red2, Red3, Blue1, Blue2, Blue3"
+          />
+          <TextInput
+            label="Red Alliance Score"
+            onInput={(input) => setRedScore(Number.parseInt(input))}
+            placeholder="0"
+          />
+          <TextInput
+            label="Blue Alliance Score"
+            onInput={(input) => setBlueScore(Number.parseInt(input))}
+            placeholder="0"
+          />
+          <Button disabled={isLoading || !isValid}>
+            {isLoading ? 'Saving Match Information' : 'Save Match'}
+          </Button>
+        </>
+      )}
+    </Form>
+  )
+}
+
+const MatchCreator = ({ eventKey }: { eventKey: string }) => (
+  <Page name={'Create Match'} back={`/events/${eventKey}`}>
+    <Card class={cardStyle}>
+      <ErrorBoundary>
+        <CreatorForm eventKey={eventKey} />
+      </ErrorBoundary>
+    </Card>
+  </Page>
+)
+
+export default MatchCreator
diff --git a/src/routes/match-editor.tsx b/src/routes/match-editor.tsx
new file mode 100644
index 000000000..800b17231
--- /dev/null
+++ b/src/routes/match-editor.tsx
@@ -0,0 +1,144 @@
+import { createEventMatch } from '@/api/match-info/create-event-match'
+import { useMatchInfo } from '@/cache/match-info/use'
+import Button from '@/components/button'
+import Card from '@/components/card'
+import { useErrorEmitter, ErrorBoundary } from '@/components/error-boundary'
+import { Form } from '@/components/form'
+import Page from '@/components/page'
+import TextInput from '@/components/text-input'
+import { route } from '@/router'
+import {
+  getTimeFromParts,
+  formatDate,
+  formatTime,
+} from '@/utils/get-time-from-parts'
+import { css } from '@linaria/core'
+import { useEffect, useState } from 'preact/hooks'
+
+const cardStyle = css`
+  margin: 1.5rem;
+  padding: 1.5rem 2rem;
+  width: 20rem;
+  margin-left: auto;
+  margin-right: auto;
+  & > * {
+    margin-left: 0;
+    margin-right: 0;
+  }
+`
+
+const EditorForm = ({
+  eventKey,
+  matchKey,
+}: {
+  eventKey: string
+  matchKey: string
+}) => {
+  const [isLoading, setIsLoading] = useState(false)
+  const emitError = useErrorEmitter()
+  const match = useMatchInfo(eventKey, matchKey)
+
+  const [day, setDay] = useState('')
+  const [time, setTime] = useState('')
+  const [teamList, setTeamList] = useState(
+    match?.redAlliance.concat(match.blueAlliance) || [''],
+  )
+  const [redScore, setRedScore] = useState(match?.redScore || 0)
+  const [blueScore, setBlueScore] = useState(match?.blueScore || 0)
+
+  useEffect(() => {
+    const matchDate = match?.time || new Date(Date.now())
+    setDay(formatDate(matchDate))
+    setTime(formatTime(matchDate))
+  }, [match])
+
+  const formatTeams = () => {
+    let output = ''
+    match?.redAlliance.forEach((team) => {
+      output += team.slice(3) + ', '
+    })
+    match?.blueAlliance.forEach((team) => {
+      output += team.slice(3) + ', '
+    })
+    return output.slice(0, -2)
+  }
+
+  const onSubmit = (e: Event) => {
+    e.preventDefault()
+    setIsLoading(true)
+    createEventMatch(eventKey, {
+      redAlliance: teamList.slice(0, 3),
+      blueAlliance: teamList.slice(3, 6),
+      time: getTimeFromParts(day, time),
+      key: matchKey,
+      redScore,
+      blueScore,
+      videos: match?.videos,
+      scheduledTime: match?.scheduledTime?.toISOString(),
+    })
+      .then(() => route(`/events/${eventKey}/matches/${matchKey}`))
+      .catch(emitError)
+      .finally(() => setIsLoading(false))
+  }
+
+  return (
+    <Form onSubmit={onSubmit}>
+      {(isValid) => (
+        <>
+          <TextInput
+            label="Date (in mm/dd format) or leave blank for current date"
+            onInput={setDay}
+            placeholder={day}
+          />
+          <TextInput
+            label="Time (in hh:mm format) or leave blank for current time"
+            onInput={setTime}
+            placeholder={time}
+          />
+          <TextInput
+            label="Teams (separate numbers with commas and spaces, red alliance first)"
+            onInput={(input) => {
+              const teams = input.split(', ')
+              for (let i = 0; i < teams.length; i++) {
+                teams[i] = 'frc' + teams[i]
+              }
+              setTeamList(teams)
+            }}
+            placeholder={formatTeams()}
+          />
+          <TextInput
+            label="Red Alliance Score"
+            onInput={(input) => setRedScore(Number.parseInt(input))}
+            placeholder={match?.redScore?.toString() || '0'}
+          />
+          <TextInput
+            label="Blue Alliance Score"
+            onInput={(input) => setBlueScore(Number.parseInt(input))}
+            placeholder={match?.blueScore?.toString() || '0'}
+          />
+          <Button disabled={isLoading || !isValid}>
+            {isLoading ? 'Saving Match Information' : 'Save Match'}
+          </Button>
+        </>
+      )}
+    </Form>
+  )
+}
+
+const MatchEditor = ({
+  eventKey,
+  matchKey,
+}: {
+  eventKey: string
+  matchKey: string
+}) => (
+  <Page name={'Edit Match'} back={`/events/${eventKey}/matches/${matchKey}`}>
+    <Card class={cardStyle}>
+      <ErrorBoundary>
+        <EditorForm eventKey={eventKey} matchKey={matchKey} />
+      </ErrorBoundary>
+    </Card>
+  </Page>
+)
+
+export default MatchEditor
diff --git a/src/utils/get-time-from-parts.ts b/src/utils/get-time-from-parts.ts
new file mode 100644
index 000000000..f3e4a6c1b
--- /dev/null
+++ b/src/utils/get-time-from-parts.ts
@@ -0,0 +1,32 @@
+export const formatTime = (date: Date) => {
+  const hourNumber = date.getHours()
+  const minuteNumber = date.getMinutes()
+  const hours = hourNumber < 10 ? '0' + String(hourNumber) : String(hourNumber)
+  const minutes =
+    minuteNumber < 10 ? '0' + String(minuteNumber) : String(minuteNumber)
+  return hours + ':' + minutes
+}
+
+export const formatDate = (date: Date) => {
+  const monthNumber = date.getMonth() + 1
+  const dayNumber = date.getDate()
+  const month =
+    monthNumber < 10 ? '0' + String(monthNumber) : String(monthNumber)
+  const day = dayNumber < 10 ? '0' + String(dayNumber) : String(dayNumber)
+  return month + '/' + day
+}
+
+export const getTimeFromParts = (date: string, time?: string) => {
+  const now = new Date(Date.now())
+  if ((date && date.length > 5) || (time && time.length !== 5))
+    return now.toISOString()
+  if (!time) time = formatTime(now)
+  if (!date) date = formatDate(now)
+
+  const month = Number.parseInt(date.slice(0, 2))
+  const day = Number.parseInt(date.slice(3, 5))
+  const hour = Number.parseInt(time.slice(0, 2))
+  const minute = Number.parseInt(time.slice(3, 5))
+  const inputDate = new Date(now.getFullYear(), month - 1, day, hour, minute)
+  return inputDate.toISOString()
+}