diff --git a/src/dispatch/auth/permissions.py b/src/dispatch/auth/permissions.py
index 10cd4b3beb94..d4936f03b3e4 100644
--- a/src/dispatch/auth/permissions.py
+++ b/src/dispatch/auth/permissions.py
@@ -15,6 +15,7 @@
 from dispatch.models import PrimaryKeyModel
 from dispatch.organization import service as organization_service
 from dispatch.organization.models import OrganizationRead
+from dispatch.participant_role.enums import ParticipantRoleType
 
 log = logging.getLogger(__name__)
 
@@ -315,6 +316,8 @@ def has_required_permissions(
             if current_incident.reporter.individual.email == current_user.email:
                 return True
 
+        return False
+
 
 class IncidentCommanderPermission(BasePermission):
     def has_required_permissions(
@@ -331,6 +334,36 @@ def has_required_permissions(
             if current_incident.commander.individual.email == current_user.email:
                 return True
 
+        return False
+
+
+class IncidentCommanderOrScribePermission(BasePermission):
+    def has_required_permissions(
+        self,
+        request: Request,
+    ) -> bool:
+        current_user = get_current_user(request=request)
+        pk = PrimaryKeyModel(id=request.path_params["incident_id"])
+        current_incident = incident_service.get(db_session=request.state.db, incident_id=pk.id)
+        if not current_incident:
+            return False
+
+        if (
+            current_incident.commander
+            and current_incident.commander.individual.email == current_user.email
+        ):
+            return True
+
+        scribes = [
+            participant.individual.email
+            for participant in current_incident.participants
+            if ParticipantRoleType.scribe in [role.role for role in participant.participant_roles]
+        ]
+        if current_user.email in scribes:
+            return True
+
+        return False
+
 
 class IncidentParticipantPermission(BasePermission):
     def has_required_permissions(
diff --git a/src/dispatch/database/revisions/tenant/versions/2023-09-15_3538650dc471.py b/src/dispatch/database/revisions/tenant/versions/2023-09-15_3538650dc471.py
new file mode 100644
index 000000000000..a2358b662ce3
--- /dev/null
+++ b/src/dispatch/database/revisions/tenant/versions/2023-09-15_3538650dc471.py
@@ -0,0 +1,31 @@
+"""Adds type to events
+
+Revision ID: 3538650dc471
+Revises: e875e9544048
+Create Date: 2023-09-12 13:43:42.539336
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = "3538650dc471"
+down_revision = "e875e9544048"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("event", sa.Column("type", sa.String(), nullable=True))
+    op.add_column("event", sa.Column("owner", sa.String(), nullable=True))
+    op.add_column("event", sa.Column("pinned", sa.Boolean(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("event", "type")
+    op.drop_column("event", "pinned")
+    op.drop_column("event", "owner")
+    # ### end Alembic commands ###
diff --git a/src/dispatch/enums.py b/src/dispatch/enums.py
index 490dc6894c29..b85a532b9627 100644
--- a/src/dispatch/enums.py
+++ b/src/dispatch/enums.py
@@ -56,3 +56,12 @@ class DocumentResourceTemplateTypes(DispatchEnum):
     incident = "dispatch-incident-document-template"
     review = "dispatch-incident-review-document-template"
     tracking = "dispatch-incident-sheet-template"
+
+
+class EventType(DispatchEnum):
+    other = "Other"  # default and catch-all (x resource created/updated, etc.)
+    field_updated = "Field updated"  # for fields like title, description, tags, type, etc.
+    assessment_updated = "Assessment updated"  # for priority, status, or severity changes
+    participant_updated = "Participant updated"  # for added/removed users and role changes
+    imported_message = "Imported message"  # for stopwatch-reacted messages from Slack
+    custom_event = "Custom event"  # for user-added events (new feature)
diff --git a/src/dispatch/event/flows.py b/src/dispatch/event/flows.py
new file mode 100644
index 000000000000..5da3ae803736
--- /dev/null
+++ b/src/dispatch/event/flows.py
@@ -0,0 +1,55 @@
+import logging
+
+from dispatch.decorators import background_task
+from dispatch.event import service as event_service
+from dispatch.incident import service as incident_service
+from dispatch.individual import service as individual_service
+from dispatch.event.models import EventUpdate, EventCreateMinimal
+
+log = logging.getLogger(__name__)
+
+
+@background_task
+def log_incident_event(
+    user_email: str,
+    incident_id: int,
+    event_in: EventCreateMinimal,
+    db_session=None,
+    organization_slug: str = None,
+):
+    incident = incident_service.get(db_session=db_session, incident_id=incident_id)
+    individual = individual_service.get_by_email_and_project(
+        db_session=db_session, email=user_email, project_id=incident.project.id
+    )
+    event_in.source = f"Custom event created by {individual.name}"
+    event_in.owner = individual.name
+
+    event_service.log_incident_event(
+        db_session=db_session,
+        incident_id=incident_id,
+        **event_in.__dict__,
+    )
+
+
+@background_task
+def update_incident_event(
+    event_in: EventUpdate,
+    db_session=None,
+    organization_slug: str = None,
+):
+    event_service.update_incident_event(
+        db_session=db_session,
+        event_in=event_in,
+    )
+
+
+@background_task
+def delete_incident_event(
+    event_uuid: str,
+    db_session=None,
+    organization_slug: str = None,
+):
+    event_service.delete_incident_event(
+        db_session=db_session,
+        uuid=event_uuid,
+    )
diff --git a/src/dispatch/event/models.py b/src/dispatch/event/models.py
index 896e397a1c89..ee96db665efb 100644
--- a/src/dispatch/event/models.py
+++ b/src/dispatch/event/models.py
@@ -3,12 +3,13 @@
 
 from typing import Optional
 
-from sqlalchemy import Column, DateTime, ForeignKey, Integer, String
+from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, Boolean
 from sqlalchemy.dialects.postgresql import UUID as SQLAlchemyUUID
 from sqlalchemy_utils import TSVectorType, JSONType
 
 from dispatch.database.core import Base
 from dispatch.models import DispatchBase, TimeStampMixin
+from dispatch.enums import EventType
 
 
 # SQLAlchemy Model
@@ -21,6 +22,9 @@ class Event(Base, TimeStampMixin):
     source = Column(String, nullable=False)
     description = Column(String, nullable=False)
     details = Column(JSONType, nullable=True)
+    type = Column(String, default=EventType.other, nullable=True)
+    owner = Column(String, nullable=True)
+    pinned = Column(Boolean, default=False)
 
     # relationships
     individual_id = Column(Integer, ForeignKey("individual_contact.id", ondelete="CASCADE"))
@@ -45,6 +49,9 @@ class EventBase(DispatchBase):
     source: str
     description: str
     details: Optional[dict]
+    type: Optional[str]
+    owner: Optional[str]
+    pinned: Optional[bool]
 
 
 class EventCreate(EventBase):
@@ -57,3 +64,12 @@ class EventUpdate(EventBase):
 
 class EventRead(EventBase):
     pass
+
+
+class EventCreateMinimal(DispatchBase):
+    started_at: datetime
+    source: str
+    description: str
+    details: dict
+    type: Optional[str]
+    owner: Optional[str]
diff --git a/src/dispatch/event/service.py b/src/dispatch/event/service.py
index 09d6c43c1e88..9c56ee3eaff6 100644
--- a/src/dispatch/event/service.py
+++ b/src/dispatch/event/service.py
@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import Optional
 from uuid import uuid4
 import datetime
 import logging
@@ -7,11 +7,12 @@
 from dispatch.case import service as case_service
 from dispatch.incident import service as incident_service
 from dispatch.individual import service as individual_service
+from dispatch.enums import EventType
 
 from .models import Event, EventCreate, EventUpdate
 
 
-logger = logging.getLogger(__name__)
+log = logging.getLogger(__name__)
 
 
 def get(*, db_session, event_id: int) -> Optional[Event]:
@@ -19,17 +20,22 @@ def get(*, db_session, event_id: int) -> Optional[Event]:
     return db_session.query(Event).filter(Event.id == event_id).one_or_none()
 
 
-def get_by_case_id(*, db_session, case_id: int) -> List[Optional[Event]]:
+def get_by_case_id(*, db_session, case_id: int) -> list[Event | None]:
     """Get events by case id."""
     return db_session.query(Event).filter(Event.case_id == case_id)
 
 
-def get_by_incident_id(*, db_session, incident_id: int) -> List[Optional[Event]]:
+def get_by_incident_id(*, db_session, incident_id: int) -> list[Event | None]:
     """Get events by incident id."""
     return db_session.query(Event).filter(Event.incident_id == incident_id)
 
 
-def get_all(*, db_session) -> List[Optional[Event]]:
+def get_by_uuid(*, db_session, uuid: str) -> list[Event | None]:
+    """Get events by uuid."""
+    return db_session.query(Event).filter(Event.uuid == uuid).one_or_none()
+
+
+def get_all(*, db_session) -> list[Event | None]:
     """Get all events."""
     return db_session.query(Event)
 
@@ -71,6 +77,9 @@ def log_incident_event(
     started_at: datetime = None,
     ended_at: datetime = None,
     details: dict = None,
+    type: str = EventType.other,
+    owner: str = "",
+    pinned: bool = False,
 ) -> Event:
     """Logs an event in the incident timeline."""
     uuid = uuid4()
@@ -88,6 +97,9 @@ def log_incident_event(
         source=source,
         description=description,
         details=details,
+        type=type,
+        owner=owner,
+        pinned=pinned,
     )
     event = create(db_session=db_session, event_in=event_in)
 
@@ -133,6 +145,7 @@ def log_case_event(
         source=source,
         description=description,
         details=details,
+        type=EventType.other,
     )
     event = create(db_session=db_session, event_in=event_in)
 
@@ -148,3 +161,24 @@ def log_case_event(
     db_session.commit()
 
     return event
+
+
+def update_incident_event(
+    db_session,
+    event_in: EventUpdate,
+) -> Event:
+    """Updates an event in the incident timeline."""
+    event = get_by_uuid(db_session=db_session, uuid=event_in.uuid)
+    event = update(db_session=db_session, event=event, event_in=event_in)
+
+    return event
+
+
+def delete_incident_event(
+    db_session,
+    uuid: str,
+):
+    """Deletes an event."""
+    event = get_by_uuid(db_session=db_session, uuid=uuid)
+
+    delete(db_session=db_session, event_id=event.id)
diff --git a/src/dispatch/incident/flows.py b/src/dispatch/incident/flows.py
index 4585f5f5d4d6..8976eec03aec 100644
--- a/src/dispatch/incident/flows.py
+++ b/src/dispatch/incident/flows.py
@@ -10,7 +10,7 @@
 from dispatch.decorators import background_task
 from dispatch.document import flows as document_flows
 from dispatch.enums import DocumentResourceTypes
-from dispatch.enums import Visibility
+from dispatch.enums import Visibility, EventType
 from dispatch.event import service as event_service
 from dispatch.group import flows as group_flows
 from dispatch.group.enums import GroupType, GroupAction
@@ -77,6 +77,7 @@ def get_incident_participants(
                 source=plugin.plugin.title,
                 description="Incident participants resolved",
                 incident_id=incident.id,
+                type=EventType.participant_updated,
             )
         else:
             event_service.log_incident_event(
@@ -84,6 +85,7 @@ def get_incident_participants(
                 source="Dispatch Core App",
                 description="Incident participants not resolved",
                 incident_id=incident.id,
+                type=EventType.participant_updated,
             )
             log.warning("Incident participants not resolved. No participant plugin enabled.")
 
@@ -104,6 +106,7 @@ def reactivate_incident_participants(incident: Incident, db_session: Session):
                 source="Dispatch Core App",
                 description=f"Unable to reactivate participant with email {participant.individual.email}",
                 incident_id=incident.id,
+                type=EventType.participant_updated,
             )
             log.exception(e)
 
@@ -112,6 +115,7 @@ def reactivate_incident_participants(incident: Incident, db_session: Session):
         source="Dispatch Core App",
         description="Incident participants reactivated",
         incident_id=incident.id,
+        type=EventType.participant_updated,
     )
 
 
@@ -129,6 +133,7 @@ def inactivate_incident_participants(incident: Incident, db_session: Session):
                 source="Dispatch Core App",
                 description=f"Unable to inactivate participant with email {participant.individual.email}",
                 incident_id=incident.id,
+                type=EventType.participant_updated,
             )
             log.exception(e)
 
@@ -137,6 +142,7 @@ def inactivate_incident_participants(incident: Incident, db_session: Session):
         source="Dispatch Core App",
         description="Incident participants inactivated",
         incident_id=incident.id,
+        type=EventType.participant_updated,
     )
 
 
@@ -276,6 +282,7 @@ def incident_create_resources(*, incident: Incident, db_session=None) -> Inciden
         source="Dispatch Core App",
         description="Incident participants added to incident",
         incident_id=incident.id,
+        type=EventType.participant_updated,
     )
 
     return incident
@@ -481,6 +488,8 @@ def conversation_topic_dispatcher(
             description=f'{individual.name} changed the incident title to "{incident.title}"',
             incident_id=incident.id,
             individual_id=individual.id,
+            type=EventType.field_updated,
+            owner=individual.name,
         )
 
     if previous_incident.description != incident.description:
@@ -491,6 +500,8 @@ def conversation_topic_dispatcher(
             details={"description": incident.description},
             incident_id=incident.id,
             individual_id=individual.id,
+            type=EventType.field_updated,
+            owner=individual.name,
         )
 
     description, details = check_for_tag_change(
@@ -504,6 +515,8 @@ def conversation_topic_dispatcher(
             details=details,
             incident_id=incident.id,
             individual_id=individual.id,
+            type=EventType.field_updated,
+            owner=individual.name,
         )
 
     if previous_incident.incident_type.name != incident.incident_type.name:
@@ -515,6 +528,8 @@ def conversation_topic_dispatcher(
             description=f"{individual.name} changed the incident type to {incident.incident_type.name}",
             incident_id=incident.id,
             individual_id=individual.id,
+            type=EventType.field_updated,
+            owner=individual.name,
         )
 
     if previous_incident.incident_severity.name != incident.incident_severity.name:
@@ -526,6 +541,8 @@ def conversation_topic_dispatcher(
             description=f"{individual.name} changed the incident severity to {incident.incident_severity.name}",
             incident_id=incident.id,
             individual_id=individual.id,
+            type=EventType.assessment_updated,
+            owner=individual.name,
         )
 
     if previous_incident.incident_priority.name != incident.incident_priority.name:
@@ -537,6 +554,8 @@ def conversation_topic_dispatcher(
             description=f"{individual.name} changed the incident priority to {incident.incident_priority.name}",
             incident_id=incident.id,
             individual_id=individual.id,
+            type=EventType.assessment_updated,
+            owner=individual.name,
         )
 
     if previous_incident.status != incident.status:
@@ -548,6 +567,8 @@ def conversation_topic_dispatcher(
             description=f"{individual.name} marked the incident as {incident.status.lower()}",
             incident_id=incident.id,
             individual_id=individual.id,
+            type=EventType.assessment_updated,
+            owner=individual.name,
         )
 
     if conversation_topic_change:
@@ -597,6 +618,7 @@ def status_flow_dispatcher(
             source="Dispatch Core App",
             description=f"The incident status has been changed from {previous_status.lower()} to {current_status.lower()}",  # noqa
             incident_id=incident.id,
+            type=EventType.assessment_updated,
         )
 
 
diff --git a/src/dispatch/incident/service.py b/src/dispatch/incident/service.py
index 5c6a70daf5af..c7838fd30bb5 100644
--- a/src/dispatch/incident/service.py
+++ b/src/dispatch/incident/service.py
@@ -193,6 +193,8 @@ def create(*, db_session, incident_in: IncidentCreate) -> Incident:
     db_session.add(incident)
     db_session.commit()
 
+    reporter_name = incident_in.reporter.individual.name if incident_in.reporter else ""
+
     event_service.log_incident_event(
         db_session=db_session,
         source="Dispatch Core App",
@@ -207,6 +209,8 @@ def create(*, db_session, incident_in: IncidentCreate) -> Incident:
             "visibility": incident.visibility,
         },
         incident_id=incident.id,
+        owner=reporter_name,
+        pinned=True,
     )
 
     # add reporter
diff --git a/src/dispatch/incident/views.py b/src/dispatch/incident/views.py
index f8c740a70230..d20d3bcdbb4f 100644
--- a/src/dispatch/incident/views.py
+++ b/src/dispatch/incident/views.py
@@ -1,7 +1,7 @@
 import calendar
 import json
 import logging
-from datetime import date
+from datetime import date, datetime
 from typing import Annotated, List
 
 from dateutil.relativedelta import relativedelta
@@ -13,6 +13,7 @@
 
 from dispatch.auth.permissions import (
     IncidentEditPermission,
+    IncidentCommanderOrScribePermission,
     IncidentJoinOrSubscribePermission,
     IncidentViewPermission,
     PermissionsDependency,
@@ -26,7 +27,9 @@
 from dispatch.models import OrganizationSlug, PrimaryKey
 from dispatch.participant.models import ParticipantUpdate
 from dispatch.report import flows as report_flows
+from dispatch.event import flows as event_flows
 from dispatch.report.models import ExecutiveReportCreate, TacticalReportCreate
+from dispatch.event.models import EventUpdate, EventCreateMinimal
 
 from .flows import (
     incident_add_or_reactivate_participant_flow,
@@ -320,6 +323,85 @@ def create_executive_report(
     )
 
 
+@router.post(
+    "/{incident_id}/event",
+    summary="Creates a custom event.",
+    dependencies=[Depends(PermissionsDependency([IncidentEditPermission]))],
+)
+def create_custom_event(
+    db_session: DbSession,
+    organization: OrganizationSlug,
+    incident_id: PrimaryKey,
+    current_incident: CurrentIncident,
+    event_in: EventCreateMinimal,
+    current_user: CurrentUser,
+    background_tasks: BackgroundTasks,
+):
+    event_in.details.update({"created_by": current_user.email, "added_on": str(datetime.utcnow())})
+    """Creates a custom event."""
+    background_tasks.add_task(
+        event_flows.log_incident_event,
+        user_email=current_user.email,
+        incident_id=current_incident.id,
+        event_in=event_in,
+        organization_slug=organization,
+    )
+
+
+@router.patch(
+    "/{incident_id}/event",
+    summary="Updates a custom event.",
+    dependencies=[Depends(PermissionsDependency([IncidentCommanderOrScribePermission]))],
+)
+def update_custom_event(
+    db_session: DbSession,
+    organization: OrganizationSlug,
+    incident_id: PrimaryKey,
+    current_incident: CurrentIncident,
+    event_in: EventUpdate,
+    current_user: CurrentUser,
+    background_tasks: BackgroundTasks,
+):
+    if event_in.details:
+        event_in.details.update(
+            {
+                **event_in.details,
+                "updated_by": current_user.email,
+                "updated_on": str(datetime.utcnow()),
+            }
+        )
+    else:
+        event_in.details = {"updated_by": current_user.email, "updated_on": str(datetime.utcnow())}
+    """Updates a custom event."""
+    background_tasks.add_task(
+        event_flows.update_incident_event,
+        event_in=event_in,
+        organization_slug=organization,
+    )
+
+
+@router.delete(
+    "/{incident_id}/event/{event_uuid}",
+    summary="Deletes a custom event.",
+    dependencies=[Depends(PermissionsDependency([IncidentCommanderOrScribePermission]))],
+)
+def delete_custom_event(
+    db_session: DbSession,
+    organization: OrganizationSlug,
+    incident_id: PrimaryKey,
+    current_incident: CurrentIncident,
+    event_uuid: str,
+    current_user: CurrentUser,
+    background_tasks: BackgroundTasks,
+):
+    """Deletes a custom event."""
+    background_tasks.add_task(
+        event_flows.delete_incident_event,
+        event_uuid=event_uuid,
+        organization_slug=organization,
+    )
+
+
 def get_month_range(relative):
     today = date.today()
     relative_month = today - relativedelta(months=relative)
diff --git a/src/dispatch/participant/flows.py b/src/dispatch/participant/flows.py
index 04b5dd56191a..6c056d2de885 100644
--- a/src/dispatch/participant/flows.py
+++ b/src/dispatch/participant/flows.py
@@ -14,6 +14,7 @@
 )
 from dispatch.participant import service as participant_service
 from dispatch.service import service as service_service
+from dispatch.enums import EventType
 
 
 log = logging.getLogger(__name__)
@@ -85,6 +86,7 @@ def add_participant(
             source="Dispatch Core App",
             description=f"{individual.name} added to incident with {participant_role.role} role",
             incident_id=subject.id,
+            type=EventType.participant_updated,
         )
 
     return participant
@@ -111,6 +113,7 @@ def remove_participant(user_email: str, incident: Incident, db_session: SessionL
             source="Dispatch Core App",
             description=f"{participant.individual.name} has been removed",
             incident_id=incident.id,
+            type=EventType.participant_updated,
         )
 
 
@@ -141,6 +144,7 @@ def inactivate_participant(user_email: str, incident: Incident, db_session: Sess
         source="Dispatch Core App",
         description=f"{participant.individual.name} has been inactivated",
         incident_id=incident.id,
+        type=EventType.participant_updated,
     )
 
     return True
@@ -183,6 +187,7 @@ def reactivate_participant(
         source="Dispatch Core App",
         description=f"{participant.individual.name} has been reactivated",
         incident_id=incident.id,
+        type=EventType.participant_updated,
     )
 
     return True
diff --git a/src/dispatch/participant_role/flows.py b/src/dispatch/participant_role/flows.py
index 652e1c3c9ff0..434ec9526860 100644
--- a/src/dispatch/participant_role/flows.py
+++ b/src/dispatch/participant_role/flows.py
@@ -5,6 +5,7 @@
 from dispatch.event import service as event_service
 from dispatch.participant import service as participant_service
 from dispatch.participant_role.models import ParticipantRoleType
+from dispatch.enums import EventType
 
 from .service import get_all_active_roles, add_role, renounce_role
 
@@ -58,6 +59,7 @@ def assign_role_flow(
             source="Dispatch Core App",
             description=f"{assignee_participant.individual.name} has been assigned the role of {assignee_role}",
             incident_id=subject.id,
+            type=EventType.participant_updated,
         )
 
         return "role_assigned"
@@ -143,6 +145,7 @@ def assign_role_flow(
                 source="Dispatch Core App",
                 description=f"{assignee_participant.individual.name} has been assigned the role of {assignee_role}",
                 incident_id=subject.id,
+                type=EventType.participant_updated,
             )
         if subject_type == "case":
             event_service.log_case_event(
diff --git a/src/dispatch/plugins/dispatch_slack/fields.py b/src/dispatch/plugins/dispatch_slack/fields.py
index 169c1ec6aa8e..0ffe595c4d47 100644
--- a/src/dispatch/plugins/dispatch_slack/fields.py
+++ b/src/dispatch/plugins/dispatch_slack/fields.py
@@ -222,10 +222,25 @@ def datetime_picker_block(
     **kwargs,
 ):
     """Builds a datetime picker block"""
+    hour = None
+    minute = None
+    date = initial_option.split("|")[0] if initial_option.split("|")[0] != "" else None
+
+    if initial_option.split("|")[1] != "":
+        # appends zero if time is not entered in hh format
+        if len(initial_option.split("|")[1].split(":")[0]) == 1:
+            h = "0" + initial_option.split("|")[1].split(":")[0]
+        else:
+            h = initial_option.split("|")[1].split(":")[0]
+        hour = {"text": h, "value": h}
+        minute = {
+            "text": initial_option.split("|")[1].split(":")[1],
+            "value": initial_option.split("|")[1].split(":")[1],
+        }
     return [
-        date_picker_input(),
-        hour_picker_input(),
-        minute_picker_input(),
+        date_picker_input(initial_date=date),
+        hour_picker_input(initial_option=hour),
+        minute_picker_input(initial_option=minute),
         timezone_picker_input(),
     ]
 
diff --git a/src/dispatch/plugins/dispatch_slack/incident/interactive.py b/src/dispatch/plugins/dispatch_slack/incident/interactive.py
index f8718e7097fa..509bd083eb3a 100644
--- a/src/dispatch/plugins/dispatch_slack/incident/interactive.py
+++ b/src/dispatch/plugins/dispatch_slack/incident/interactive.py
@@ -1,4 +1,5 @@
 import logging
+import re
 import uuid
 from datetime import datetime, timedelta
 from typing import Any
@@ -28,7 +29,7 @@
 from dispatch.auth.models import DispatchUser
 from dispatch.config import DISPATCH_UI_URL
 from dispatch.database.service import search_filter_sort_paginate
-from dispatch.enums import Visibility
+from dispatch.enums import Visibility, EventType
 from dispatch.event import service as event_service
 from dispatch.exceptions import DispatchException
 from dispatch.group import flows as group_flows
@@ -686,11 +687,13 @@ def handle_timeline_added_event(
         # we log the event
         event_service.log_incident_event(
             db_session=db_session,
-            source="Slack Plugin - Conversation Management",
+            source=f"Slack message from {individual.name}",
             description=f'"{message_text}," said {individual.name}',
             incident_id=context["subject"].id,
             individual_id=individual.id,
             started_at=message_ts_utc,
+            type=EventType.imported_message,
+            owner=individual.name,
         )
 
 
@@ -735,6 +738,7 @@ def handle_participant_role_activity(
                             f"{ParticipantRoleType.participant} due to activity in the incident channel"
                         ),
                         incident_id=context["subject"].id,
+                        type=EventType.participant_updated,
                     )
 
             db_session.commit()
@@ -972,6 +976,31 @@ def handle_add_timeline_event_command(
 ) -> None:
     """Handles the add timeline event command."""
     ack()
+    description = None
+    date = ""
+    time = ""
+    if re.match(".*DESC\\s*(.+?)(?: DATE|$|TIME)", body["text"], re.IGNORECASE):
+        description = (
+            re.match("DESC\\s*(.+?)(?: DATE|$|TIME)", body["text"], re.IGNORECASE).group(1)
+        ).strip()
+    if re.match(
+        ".*DATE\\s*(\\d{4}\\-\\d{2}\\-\\d{2})(?: TIME|$|DESC)", body["text"], re.IGNORECASE
+    ):
+        date = (
+            re.match(
+                ".*DATE\\s*(\\d{4}\\-\\d{2}\\-\\d{2})(?: TIME|$|DESC)", body["text"], re.IGNORECASE
+            ).group(1)
+        ).strip()
+    if re.match(
+        ".*TIME\\s*(([01]?[0-9]|2[0-3]):[0-5][0-9])(?: |DATE|$|DESC)", body["text"], re.IGNORECASE
+    ):
+        time = (
+            re.match(
+                ".*TIME\\s*(([01]?[0-9]|2[0-3]):[0-5][0-9])(?: |DATE|$|DESC)",
+                body["text"],
+                re.IGNORECASE,
+            ).group(1)
+        ).strip()
 
     blocks = [
         Context(
@@ -979,10 +1008,10 @@ def handle_add_timeline_event_command(
                 MarkdownText(text="Use this form to add an event to the incident's timeline.")
             ]
         ),
-        description_input(),
+        description_input(initial_value=description),
     ]
 
-    blocks.extend(datetime_picker_block())
+    blocks.extend(datetime_picker_block(initial_option=date + "|" + time))
 
     modal = Modal(
         title="Add Timeline Event",
@@ -1041,11 +1070,13 @@ def handle_add_timeline_submission_event(
 
     event_service.log_incident_event(
         db_session=db_session,
-        source="Slack Plugin - Conversation Management",
+        source=f"Slack message from {participant.individual.name}",
         started_at=event_dt_utc,
         description=f'"{event_description}," said {participant.individual.name}',
         incident_id=context["subject"].id,
         individual_id=participant.individual.id,
+        type=EventType.imported_message,
+        owner=participant.individual.name,
     )
 
     send_success_modal(
diff --git a/src/dispatch/static/dispatch/src/components/DateTimePickerMenu.vue b/src/dispatch/static/dispatch/src/components/DateTimePickerMenu.vue
index cac5aa52aa6d..98f6b5286ebb 100644
--- a/src/dispatch/static/dispatch/src/components/DateTimePickerMenu.vue
+++ b/src/dispatch/static/dispatch/src/components/DateTimePickerMenu.vue
@@ -51,7 +51,7 @@
 </template>
 <script>
 import { parse, parseISO } from "date-fns"
-import { format } from "date-fns-tz"
+import { format, utcToZonedTime } from "date-fns-tz"
 
 const DEFAULT_DATE = ""
 const DEFAULT_TIME = "00:00:00"
@@ -83,6 +83,10 @@ export default {
       type: String,
       default: "HH:mm",
     },
+    timeZone: {
+      type: String,
+      default: null,
+    },
   },
 
   data() {
@@ -105,7 +109,9 @@ export default {
       return DEFAULT_DATE_FORMAT + " " + DEFAULT_TIME_FORMAT
     },
     formattedDatetime() {
-      return this.selectedDatetime ? format(this.selectedDatetime, this.dateTimeFormat) : ""
+      return this.selectedDatetime
+        ? format(this.selectedDatetime, this.dateTimeFormat, { timeZone: this.timeZone })
+        : ""
     },
     selectedDatetime() {
       if (this.date && this.time) {
@@ -134,8 +140,12 @@ export default {
       } else if (typeof this.datetime === "string" || this.datetime instanceof String) {
         initDateTime = parseISO(this.datetime)
       }
-      this.date = format(initDateTime, DEFAULT_DATE_FORMAT)
-      this.time = format(initDateTime, DEFAULT_TIME_FORMAT)
+
+      const zonedDateTime = this.timeZone
+        ? utcToZonedTime(initDateTime, this.timeZone)
+        : initDateTime
+      this.date = format(zonedDateTime, DEFAULT_DATE_FORMAT, { timeZone: this.timeZone })
+      this.time = format(zonedDateTime, DEFAULT_TIME_FORMAT, { timeZone: this.timeZone })
     },
     okHandler() {
       this.resetPicker()
@@ -163,6 +173,9 @@ export default {
     datetime: function () {
       this.init()
     },
+    timeZone: function () {
+      this.init()
+    },
   },
 }
 </script>
diff --git a/src/dispatch/static/dispatch/src/incident/DeleteEventDialog.vue b/src/dispatch/static/dispatch/src/incident/DeleteEventDialog.vue
new file mode 100644
index 000000000000..9df60d5bae9f
--- /dev/null
+++ b/src/dispatch/static/dispatch/src/incident/DeleteEventDialog.vue
@@ -0,0 +1,37 @@
+<template>
+  <v-dialog v-model="showDeleteEventDialog" persistent max-width="800px">
+    <v-card>
+      <v-card-title>
+        <span class="headline">Delete Event?</span>
+      </v-card-title>
+      <v-card-text>
+        <v-container grid-list-md>
+          <v-layout wrap> Are you sure you want to delete this event? </v-layout>
+        </v-container>
+      </v-card-text>
+      <v-card-actions>
+        <v-spacer />
+        <v-btn color="blue en-1" text @click="closeDeleteEventDialog()"> Cancel </v-btn>
+        <v-btn color="red en-1" text @click="deleteEvent()"> Delete </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script>
+import { mapFields } from "vuex-map-fields"
+import { mapActions } from "vuex"
+export default {
+  name: "DeleteEventDialog",
+  data() {
+    return {}
+  },
+  computed: {
+    ...mapFields("incident", ["dialogs.showDeleteEventDialog"]),
+  },
+
+  methods: {
+    ...mapActions("incident", ["closeDeleteEventDialog", "deleteEvent"]),
+  },
+}
+</script>
diff --git a/src/dispatch/static/dispatch/src/incident/EditEventDialog.vue b/src/dispatch/static/dispatch/src/incident/EditEventDialog.vue
new file mode 100644
index 000000000000..722d7c40db06
--- /dev/null
+++ b/src/dispatch/static/dispatch/src/incident/EditEventDialog.vue
@@ -0,0 +1,114 @@
+<template>
+  <v-dialog v-model="showEditEventDialog" persistent max-width="750px">
+    <v-card>
+      <v-card-title>
+        <span v-if="uuid" class="headline">Create new event</span>
+        <span v-else class="headline">Edit event</span>
+      </v-card-title>
+      <v-card-text>
+        <v-container grid-list-md class="mt-3">
+          <v-layout wrap>
+            <v-row>
+              <date-time-picker-menu
+                label="Reported At"
+                v-model="started_at"
+                class="time-picker"
+                :timeZone="timezone"
+              />
+              <v-select
+                v-model="timezone"
+                label="Time zone"
+                :items="timezones"
+                class="ml-2 time-zone-select"
+              />
+              <v-btn color="green en-1" class="ml-10 mt-3" width="100" @click="setTimeToNow()">
+                Now
+              </v-btn>
+            </v-row>
+            <v-row>
+              <span class="ml-8 time-utc"> Time in UTC is {{ started_at | formatToUTC }} </span>
+            </v-row>
+            <v-flex xs12>
+              <v-textarea
+                v-model="description"
+                class="mt-3"
+                label="Description"
+                hint="Description of the event."
+                clearable
+                required
+              />
+            </v-flex>
+          </v-layout>
+        </v-container>
+      </v-card-text>
+      <v-card-actions>
+        <v-spacer />
+        <v-btn text @click="closeEditEventDialog()"> Cancel </v-btn>
+        <v-btn v-if="uuid" color="green en-1" text @click="updateExistingEvent()"> OK </v-btn>
+        <v-btn v-else color="green en-1" text @click="storeNewEvent()"> OK </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script>
+import { mapFields } from "vuex-map-fields"
+import { mapActions } from "vuex"
+
+import DateTimePickerMenu from "@/components/DateTimePickerMenu.vue"
+import moment from "moment-timezone"
+
+export default {
+  name: "EditEventDialog",
+
+  data() {
+    return {
+      timezones: ["UTC", "America/Los_Angeles"],
+      timezone: "UTC",
+    }
+  },
+
+  components: {
+    DateTimePickerMenu,
+  },
+
+  computed: {
+    ...mapFields("incident", [
+      "dialogs.showEditEventDialog",
+      "selected.currentEvent.started_at",
+      "selected.currentEvent.description",
+      "selected.currentEvent.uuid",
+    ]),
+  },
+
+  methods: {
+    ...mapActions("incident", ["closeEditEventDialog", "storeNewEvent", "updateExistingEvent"]),
+    init() {
+      const local_zone_name = moment.tz.guess() || "America/Los_Angeles"
+      if (!this.timezones.includes(local_zone_name)) {
+        this.timezones.push(local_zone_name)
+      }
+      this.timezone = local_zone_name
+    },
+    setTimeToNow() {
+      this.eventStart = new Date()
+    },
+  },
+  mounted() {
+    this.init()
+  },
+}
+</script>
+
+<style scoped>
+.time-picker {
+  max-width: 500px;
+}
+.time-zone-select {
+  max-width: 250px;
+}
+
+.time-utc {
+  margin-top: -15px;
+}
+</style>
diff --git a/src/dispatch/static/dispatch/src/incident/EditSheet.vue b/src/dispatch/static/dispatch/src/incident/EditSheet.vue
index 1031975dbea7..e0970353618b 100644
--- a/src/dispatch/static/dispatch/src/incident/EditSheet.vue
+++ b/src/dispatch/static/dispatch/src/incident/EditSheet.vue
@@ -1,6 +1,12 @@
 <template>
   <ValidationObserver v-slot="{ invalid, validated }">
-    <v-navigation-drawer app right width="800" :permanent="$vuetify.breakpoint.mdAndDown">
+    <v-navigation-drawer
+      app
+      right
+      :width="navigation.width"
+      ref="drawer"
+      :permanent="$vuetify.breakpoint.mdAndDown"
+    >
       <template #prepend>
         <v-list-item two-line>
           <v-list-item-content>
@@ -92,6 +98,11 @@ export default {
   data() {
     return {
       tab: null,
+      navigation: {
+        width: 800,
+        borderSize: 3,
+        minWidth: 400,
+      },
     }
   },
 
@@ -115,6 +126,14 @@ export default {
     "$route.params.name": function () {
       this.fetchDetails()
     },
+    $route: {
+      immediate: true,
+      handler: function (newVal) {
+        if (newVal.meta && newVal.meta.showTimeline) {
+          this.tab = 3
+        }
+      },
+    },
   },
 
   methods: {
@@ -122,6 +141,70 @@ export default {
       this.getDetails({ name: this.$route.params.name })
     },
     ...mapActions("incident", ["save", "getDetails", "closeEditSheet"]),
+    setBorderWidth() {
+      const drawerBorder = this.$refs.drawer.$el.querySelector(".v-navigation-drawer__border")
+      drawerBorder.style.width = this.navigation.borderSize + "px"
+      drawerBorder.style.cursor = "ew-resize"
+      drawerBorder.style.backgroundColor = "#E4E4E4"
+    },
+    setEvents() {
+      const borderSize = this.navigation.borderSize
+      const minWidth = this.navigation.minWidth
+      const drawerElement = this.$refs.drawer.$el
+      const drawerBorder = drawerElement.querySelector(".v-navigation-drawer__border")
+
+      function resize(e) {
+        document.body.style.cursor = "ew-resize"
+        let f = document.body.scrollWidth - e.clientX
+        if (f < minWidth) {
+          f = minWidth
+        }
+        drawerElement.style.width = f + "px"
+      }
+
+      drawerBorder.addEventListener(
+        "mouseover",
+        () => {
+          drawerBorder.style.backgroundColor = "red"
+        },
+        false
+      )
+
+      drawerBorder.addEventListener(
+        "mouseout",
+        () => {
+          drawerBorder.style.backgroundColor = "#E4E4E4"
+        },
+        false
+      )
+
+      drawerBorder.addEventListener(
+        "mousedown",
+        (e) => {
+          if (e.offsetX < borderSize) {
+            drawerElement.style.transition = "initial"
+            document.addEventListener("mousemove", resize, false)
+          }
+        },
+        false
+      )
+
+      document.addEventListener(
+        "mouseup",
+        () => {
+          drawerElement.style.transition = ""
+          this.navigation.width = drawerElement.style.width
+          document.body.style.cursor = ""
+          document.removeEventListener("mousemove", resize, false)
+        },
+        false
+      )
+    },
+  },
+
+  mounted() {
+    this.setBorderWidth()
+    this.setEvents()
   },
 }
 </script>
diff --git a/src/dispatch/static/dispatch/src/incident/TimelineFilterDialog.vue b/src/dispatch/static/dispatch/src/incident/TimelineFilterDialog.vue
new file mode 100644
index 000000000000..d82eba369973
--- /dev/null
+++ b/src/dispatch/static/dispatch/src/incident/TimelineFilterDialog.vue
@@ -0,0 +1,152 @@
+<template>
+  <v-dialog v-model="display" max-width="350px">
+    <template #activator="{ on }">
+      <v-badge
+        :value="numFilters"
+        bordered
+        overlap
+        color="info"
+        :content="numFilters"
+        class="mt-3 mr-3"
+      >
+        <v-btn color="secondary" v-on="on">
+          <v-icon left class="mr-1">mdi-filter</v-icon> Filter
+        </v-btn>
+      </v-badge>
+    </template>
+    <v-card>
+      <v-card-title>
+        <span class="headline">Timeline Filters</span>
+      </v-card-title>
+      <v-card-subtitle class="subtitle_top">
+        Only show the following types of events
+      </v-card-subtitle>
+      <v-list dense>
+        <v-list-item>
+          <v-list-item-content class="pl-5 pt-5">
+            <v-row align="center">
+              <v-simple-checkbox v-model="local_filters.assessment_updates" color="#e50815" />
+              <v-icon left class="mr-2">mdi-priority-high</v-icon>
+              Assessment updates
+            </v-row>
+            <span class="text-caption ml-5">Priority, severity, and status</span>
+          </v-list-item-content>
+        </v-list-item>
+        <v-list-item>
+          <v-list-item-content class="pl-5 pt-5">
+            <v-row align="center">
+              <v-simple-checkbox v-model="local_filters.user_curated_events" color="#e50815" />
+              <v-icon left class="mr-2">mdi-text-account</v-icon>
+              User-curated events
+            </v-row>
+            <span class="text-caption ml-5">Custom events and imported messages</span>
+          </v-list-item-content>
+        </v-list-item>
+        <v-list-item>
+          <v-list-item-content class="pl-5 pt-5">
+            <v-row align="center">
+              <v-simple-checkbox v-model="local_filters.field_updates" color="#e50815" />
+              <v-icon left class="mr-2">mdi-subtitles-outline</v-icon>
+              Field updates
+            </v-row>
+            <span class="text-caption ml-5">Fields like title, description, tags, type, etc.</span>
+          </v-list-item-content>
+        </v-list-item>
+        <v-list-item>
+          <v-list-item-content class="pl-5 pt-5">
+            <v-row align="center">
+              <v-simple-checkbox v-model="local_filters.participant_updates" color="#e50815" />
+              <v-icon left class="mr-2">mdi-account-outline</v-icon>
+              Participant updates
+            </v-row>
+            <span class="text-caption ml-5">Added/removed participants and role changes</span>
+          </v-list-item-content>
+        </v-list-item>
+        <v-list-item>
+          <v-list-item-content class="pl-5 pt-5">
+            <v-row align="center">
+              <v-simple-checkbox v-model="local_filters.other_events" color="#e50815" />
+              <v-icon left class="mr-2">mdi-monitor-star</v-icon>
+              Other events
+            </v-row>
+            <span class="text-caption ml-5">System events, resource creation, etc.</span>
+          </v-list-item-content>
+        </v-list-item>
+      </v-list>
+      <v-card-actions>
+        <v-spacer />
+        <v-btn color="info" text @click="applyFilters()"> Apply Filters </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script>
+import { sum } from "lodash"
+import { mapFields } from "vuex-map-fields"
+
+function invertBooleanValues(obj) {
+  return Object.keys(obj).reduce((acc, key) => {
+    acc[key] = !obj[key]
+    return acc
+  }, {})
+}
+
+export default {
+  name: "IncidentTimelineFilterDialog",
+
+  props: {
+    projects: {
+      type: Array,
+      default: function () {
+        return []
+      },
+    },
+  },
+
+  data() {
+    return {
+      display: false,
+      local_filters: {
+        field_updates: false,
+        assessment_updates: true,
+        user_curated_events: true,
+        participant_updates: false,
+        other_events: false,
+      },
+    }
+  },
+
+  computed: {
+    ...mapFields("incident", ["timeline_filters"]),
+    numFilters: function () {
+      return sum(Object.values(this.timeline_filters))
+    },
+  },
+
+  methods: {
+    applyFilters() {
+      this.timeline_filters = invertBooleanValues(this.local_filters)
+      this.display = false
+    },
+  },
+
+  created() {
+    this.$watch(
+      (vm) => [vm.display],
+      () => {
+        if (this.display) {
+          // copy actual to local on dialog show
+          this.local_filters = invertBooleanValues(this.timeline_filters)
+        }
+      }
+    )
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.subtitle_top {
+  margin-top: -10px;
+}
+</style>
diff --git a/src/dispatch/static/dispatch/src/incident/TimelineTab.vue b/src/dispatch/static/dispatch/src/incident/TimelineTab.vue
index 7c4eee510c12..ee7843b469e3 100644
--- a/src/dispatch/static/dispatch/src/incident/TimelineTab.vue
+++ b/src/dispatch/static/dispatch/src/incident/TimelineTab.vue
@@ -1,6 +1,6 @@
 <template>
   <v-container>
-    <v-row justify="end">
+    <v-row justify="end" class="align-items-baseline">
       <v-switch v-model="showDetails" label="Show details" />
       <v-btn
         color="secondary"
@@ -10,15 +10,39 @@
       >
         Export
       </v-btn>
+      <timeline-filter-dialog ref="filter_dialog" />
+      <edit-event-dialog />
+      <delete-event-dialog />
     </v-row>
     <v-timeline v-if="events && events.length" dense clipped>
-      <v-col class="text-right caption">(times in UTC)</v-col>
+      <v-col class="text-right caption time-zone-notice">(times in UTC)</v-col>
+      <v-row>
+        <div
+          class="add-event"
+          style="--margtop: 0px; --margbot: 5px; --margrule: 20px; margin-left: 85px"
+        >
+          <div class="horiz-rule" />
+          <div class="add-button">
+            <v-btn
+              compact
+              small
+              plain
+              class="up-button"
+              @click="showNewPreEventDialog(sortedEvents[0].started_at)"
+            >
+              <v-icon small class="mr-1">mdi-plus-circle-outline</v-icon>Add event
+            </v-btn>
+          </div>
+        </div>
+      </v-row>
       <v-timeline-item
         v-for="event in sortedEvents"
+        v-show="showItem(event)"
+        :icon="iconItem(event)"
         :key="event.id"
         class="mb-4"
+        :class="classType(event)"
         color="blue"
-        small
       >
         <v-row justify="space-between">
           <v-col cols="7">
@@ -37,32 +61,120 @@
               {{ event.source }}
             </div>
           </v-col>
-          <v-col class="text-right" cols="5">
-            <v-tooltip bottom>
-              <template #activator="{ on, attrs }">
-                <span v-bind="attrs" v-on="on" class="wavy-underline">{{
-                  event.started_at | formatToUTC
-                }}</span>
-              </template>
-              <span class="pre-formatted">{{ event.started_at | formatToTimeZones }}</span>
-            </v-tooltip>
+          <v-col cols="1">
+            <div v-if="isEditable(event)" class="custom-event-edit">
+              <v-btn plain small @click="showEditEventDialog(event)">
+                <v-icon>mdi-pencil</v-icon>
+              </v-btn>
+              <br />
+              <v-btn plain small @click="togglePin(event)">
+                <v-hover v-slot="{ hover }">
+                  <v-icon v-if="!isPinned(event)">mdi-pin-outline</v-icon>
+                  <v-icon v-else-if="hover && isPinned(event)">mdi-pin-off</v-icon>
+                  <v-icon v-else-if="!hover && isPinned(event)">mdi-pin</v-icon>
+                </v-hover>
+              </v-btn>
+              <br />
+              <v-btn plain small @click="showDeleteEventDialog(event)">
+                <v-icon>mdi-trash-can</v-icon>
+              </v-btn>
+            </div>
+            <div v-if="isPinned(event) && !isEditable(event)" class="pinned-event">
+              <v-btn plain small @click="togglePin(event)">
+                <v-hover v-slot="{ hover }">
+                  <v-icon v-if="hover">mdi-pin-off</v-icon>
+                  <v-icon v-else>mdi-pin</v-icon>
+                </v-hover>
+              </v-btn>
+            </div>
+            <div v-if="isPinned(event) && isEditable(event)" class="pinned-custom-event">
+              <v-btn plain small @click="togglePin(event)">
+                <v-icon>mdi-pin</v-icon>
+              </v-btn>
+            </div>
+            <div v-else-if="!isPinned(event) && !isEditable(event)" class="pinned-event">
+              <v-btn plain small @click="togglePin(event)">
+                <v-icon>mdi-pin-outline</v-icon>
+              </v-btn>
+            </div>
+          </v-col>
+          <v-col class="text-right" cols="4">
+            <v-col>
+              <v-tooltip bottom>
+                <template #activator="{ on, attrs }">
+                  <span v-bind="attrs" v-on="on" class="wavy-underline">{{
+                    event.started_at | formatToUTC
+                  }}</span>
+                </template>
+                <span class="pre-formatted">{{ event.started_at | formatToTimeZones }}</span>
+              </v-tooltip>
+            </v-col>
           </v-col>
         </v-row>
+        <v-row>
+          <div class="add-event" style="--margtop: -40px; --margbot: 0px; --margrule: 40px">
+            <div class="horiz-rule" />
+            <div class="add-button">
+              <v-btn
+                compact
+                small
+                plain
+                class="up-button"
+                @click="showNewEventDialog(event.started_at)"
+              >
+                <v-icon small class="mr-1">mdi-plus-circle-outline</v-icon>Add event
+              </v-btn>
+            </div>
+          </div>
+        </v-row>
       </v-timeline-item>
     </v-timeline>
     <div v-else>
       <p class="text-center">No timeline data available.</p>
     </div>
+    <div class="text-caption ml-10" v-if="countHidden() != 0">
+      {{ "" + countHidden() }} event(s) are hidden due to current filter
+    </div>
   </v-container>
 </template>
 
 <script>
+import { sum } from "lodash"
 import { mapFields } from "vuex-map-fields"
+import { mapActions } from "vuex"
+
 import Util from "@/util"
+import TimelineFilterDialog from "@/incident/TimelineFilterDialog.vue"
+import EditEventDialog from "@/incident/EditEventDialog.vue"
+import DeleteEventDialog from "@/incident/DeleteEventDialog.vue"
+
+const eventTypeToIcon = {
+  Other: "mdi-monitor-star",
+  "Field updated": "mdi-subtitles-outline",
+  "Assessment updated": "mdi-priority-high",
+  "Participant updated": "mdi-account-outline",
+  "Custom event": "mdi-text-account",
+  "Imported message": "mdi-page-next-outline",
+}
+
+const eventTypeToFilter = {
+  Other: "other_events",
+  "Field updated": "field_updates",
+  "Assessment updated": "assessment_updates",
+  "Participant updated": "participant_updates",
+  "Custom event": "user_curated_events",
+  "Imported message": "user_curated_events",
+}
 
 export default {
   name: "IncidentTimelineTab",
 
+  components: {
+    TimelineFilterDialog,
+    EditEventDialog,
+    DeleteEventDialog,
+  },
+
   data() {
     return {
       showDetails: false,
@@ -71,19 +183,72 @@ export default {
   },
 
   computed: {
-    ...mapFields("incident", ["selected.events", "selected.name"]),
+    ...mapFields("incident", ["selected.events", "selected.name", "timeline_filters"]),
 
     sortedEvents: function () {
       return this.events.slice().sort((a, b) => new Date(a.started_at) - new Date(b.started_at))
     },
   },
   methods: {
+    ...mapActions("incident", [
+      "showNewEventDialog",
+      "showEditEventDialog",
+      "showDeleteEventDialog",
+      "showNewPreEventDialog",
+      "togglePin",
+    ]),
     exportToCSV() {
       this.exportLoading = true
+      const selected_items = []
       let items = this.sortedEvents
-      Util.exportCSV(items, this.name + "-timeline-export.csv")
+      items.forEach((item) => {
+        if (this.showItem(item)) {
+          selected_items.push(item)
+        }
+      })
+
+      Util.exportCSV(
+        selected_items.map((item) => ({
+          "Time (in UTC)": item.started_at,
+          Description: item.description,
+          Owner: this.extractOwner(item),
+        })),
+        this.name + "-timeline-export.csv"
+      )
       this.exportLoading = false
     },
+    showItem(event) {
+      if (event.pinned) return true
+      return !this.timeline_filters[eventTypeToFilter[event.type]]
+    },
+    iconItem(event) {
+      if (event.description == "Incident created") return "mdi-flare"
+      return eventTypeToIcon[event.type]
+    },
+    extractOwner(event) {
+      if (event.owner != null && event.owner != "") return event.owner
+      return "Dispatch"
+    },
+    countHidden() {
+      if (!this.events) return 0
+      return sum(
+        this.events.map((e) => {
+          return this.timeline_filters[eventTypeToFilter[e.type]] || false
+        })
+      )
+    },
+    isEditable(event) {
+      return event.type == "Custom event" || event.type == "Imported message"
+    },
+    classType(event) {
+      if (event.type == "Custom event" || event.type == "Imported message") {
+        return "custom-event"
+      }
+      return "pinned-event"
+    },
+    isPinned(event) {
+      return event.pinned
+    },
   },
 }
 </script>
diff --git a/src/dispatch/static/dispatch/src/incident/api.js b/src/dispatch/static/dispatch/src/incident/api.js
index 1f77a9053460..26debe2a1895 100644
--- a/src/dispatch/static/dispatch/src/incident/api.js
+++ b/src/dispatch/static/dispatch/src/incident/api.js
@@ -59,6 +59,18 @@ export default {
     return API.post(`/${resource}/${incidentId}/report/${type}`, payload)
   },
 
+  createNewEvent(incidentId, payload) {
+    return API.post(`/${resource}/${incidentId}/event`, payload)
+  },
+
+  updateEvent(incidentId, payload) {
+    return API.patch(`/${resource}/${incidentId}/event`, payload)
+  },
+
+  deleteEvent(incidentId, event_uuid) {
+    return API.delete(`/${resource}/${incidentId}/event/${event_uuid}`)
+  },
+
   createAllResources(incidentId, payload) {
     return API.post(`/${resource}/${incidentId}/resources`, payload)
   },
diff --git a/src/dispatch/static/dispatch/src/incident/store.js b/src/dispatch/static/dispatch/src/incident/store.js
index f43befd9717d..81be1bf32601 100644
--- a/src/dispatch/static/dispatch/src/incident/store.js
+++ b/src/dispatch/static/dispatch/src/incident/store.js
@@ -6,6 +6,8 @@ import IncidentApi from "@/incident/api"
 import PluginApi from "@/plugin/api"
 import router from "@/router"
 
+import moment from "moment-timezone"
+
 const getDefaultSelectedState = () => {
   return {
     cases: [],
@@ -39,6 +41,7 @@ const getDefaultSelectedState = () => {
     visibility: null,
     workflow_instances: null,
     loading: false,
+    currentEvent: {},
   }
 }
 
@@ -69,6 +72,8 @@ const state = {
     showHandoffDialog: false,
     showNewSheet: false,
     showReportDialog: false,
+    showEditEventDialog: false,
+    showDeleteEventDialog: false,
   },
   report: {
     ...getDefaultReportState(),
@@ -109,6 +114,13 @@ const state = {
     loading: false,
     bulkEditLoading: false,
   },
+  timeline_filters: {
+    field_updates: true,
+    assessment_updates: false,
+    user_curated_events: false,
+    participant_updates: true,
+    other_events: true,
+  },
 }
 
 const getters = {
@@ -235,6 +247,90 @@ const actions = {
     commit("SET_DIALOG_SHOW_HANDOFF", false)
     commit("RESET_SELECTED")
   },
+  showEditEventDialog({ commit }, event) {
+    state.selected.currentEvent = event
+    commit("SET_DIALOG_EDIT_EVENT", true)
+  },
+  closeEditEventDialog({ commit }) {
+    commit("SET_DIALOG_EDIT_EVENT", false)
+  },
+  showNewPreEventDialog({ commit }, started_at) {
+    started_at = moment(started_at).subtract(1, "seconds").toISOString()
+    state.selected.currentEvent = { started_at, description: "" }
+    commit("SET_DIALOG_EDIT_EVENT", true)
+  },
+  showNewEventDialog({ commit }, started_at) {
+    started_at = moment(started_at).add(1, "seconds").toISOString()
+    state.selected.currentEvent = { started_at, description: "" }
+    commit("SET_DIALOG_EDIT_EVENT", true)
+  },
+  showDeleteEventDialog({ commit }, event) {
+    state.selected.currentEvent = event
+    commit("SET_DIALOG_DELETE_EVENT", true)
+  },
+  togglePin({ commit }, event) {
+    state.selected.currentEvent = event
+    state.selected.currentEvent.pinned = !state.selected.currentEvent.pinned
+    IncidentApi.updateEvent(state.selected.id, state.selected.currentEvent).then(() => {
+      IncidentApi.get(state.selected.id).then((response) => {
+        commit("SET_SELECTED", response.data)
+      })
+      commit(
+        "notification_backend/addBeNotification",
+        { text: "Event updated successfully.", type: "success" },
+        { root: true }
+      )
+    })
+    commit("SET_DIALOG_EDIT_EVENT", false)
+  },
+  closeDeleteEventDialog({ commit }) {
+    commit("SET_DIALOG_DELETE_EVENT", false)
+  },
+  storeNewEvent({ commit }) {
+    IncidentApi.createNewEvent(state.selected.id, {
+      source: "Incident Participant",
+      description: state.selected.currentEvent.description,
+      started_at: state.selected.currentEvent.started_at,
+      type: "Custom event",
+      details: {},
+    }).then(() => {
+      IncidentApi.get(state.selected.id).then((response) => {
+        commit("SET_SELECTED", response.data)
+      })
+      commit(
+        "notification_backend/addBeNotification",
+        { text: "Event created successfully.", type: "success" },
+        { root: true }
+      )
+    })
+    commit("SET_DIALOG_EDIT_EVENT", false)
+  },
+  updateExistingEvent({ commit }) {
+    IncidentApi.updateEvent(state.selected.id, state.selected.currentEvent).then(() => {
+      IncidentApi.get(state.selected.id).then((response) => {
+        commit("SET_SELECTED", response.data)
+      })
+      commit(
+        "notification_backend/addBeNotification",
+        { text: "Event updated successfully.", type: "success" },
+        { root: true }
+      )
+    })
+    commit("SET_DIALOG_EDIT_EVENT", false)
+  },
+  deleteEvent({ commit }) {
+    IncidentApi.deleteEvent(state.selected.id, state.selected.currentEvent.uuid).then(() => {
+      IncidentApi.get(state.selected.id).then((response) => {
+        commit("SET_SELECTED", response.data)
+      })
+      commit(
+        "notification_backend/addBeNotification",
+        { text: "Event deleted successfully.", type: "success" },
+        { root: true }
+      )
+    })
+    commit("SET_DIALOG_DELETE_EVENT", false)
+  },
   report({ commit, dispatch }) {
     commit("SET_SELECTED_LOADING", true)
     return IncidentApi.create(state.selected)
@@ -473,6 +569,12 @@ const mutations = {
   SET_DIALOG_DELETE(state, value) {
     state.dialogs.showDeleteDialog = value
   },
+  SET_DIALOG_EDIT_EVENT(state, value) {
+    state.dialogs.showEditEventDialog = value
+  },
+  SET_DIALOG_DELETE_EVENT(state, value) {
+    state.dialogs.showDeleteEventDialog = value
+  },
   SET_DIALOG_REPORT(state, value) {
     state.dialogs.showReportDialog = value
   },
diff --git a/src/dispatch/static/dispatch/src/router/config.js b/src/dispatch/static/dispatch/src/router/config.js
index 1be3119d3812..a05bf8ec0644 100644
--- a/src/dispatch/static/dispatch/src/router/config.js
+++ b/src/dispatch/static/dispatch/src/router/config.js
@@ -159,6 +159,16 @@ export const protectedRoute = [
                 showEditSheet: true,
               },
             },
+            {
+              path: "/:organization/incidents/:name/timeline",
+              name: "IncidentTableEdit",
+              component: () => import("@/incident/EditSheet.vue"),
+              props: true,
+              meta: {
+                showEditSheet: true,
+                showTimeline: true,
+              },
+            },
           ],
         },
       ],
diff --git a/src/dispatch/static/dispatch/src/styles/timeline.css b/src/dispatch/static/dispatch/src/styles/timeline.css
index 454661a7d1b1..9795da67aa8a 100644
--- a/src/dispatch/static/dispatch/src/styles/timeline.css
+++ b/src/dispatch/static/dispatch/src/styles/timeline.css
@@ -9,3 +9,88 @@
 .pre-formatted {
     white-space: pre;
 }
+
+.time-zone-notice {
+  margin-top: -10px;
+  margin-bottom: -20px;
+}
+
+.up-button {
+  margin-top: -10px;
+}
+
+.add-event .add-button {
+  background-color: var(--v-background0-base);
+  font-size: 2.85rem;
+  color: rgb(140 154 170);
+  line-height: 1rem;
+  display: none;
+  margin-top: -20px;
+}
+
+.add-event:hover .add-button {
+  display: inline-block;
+}
+
+.add-event {
+  background-color: transparent;
+  align-items: center;
+  text-align: center;
+  width: 100%;
+  display: block;
+  height: 40px;
+  margin-top: var(--margtop);
+  margin-bottom: var(--margbot);
+  position: relative;
+  z-index: 99;
+}
+
+.add-event .horiz-rule {
+  display: none;
+  background-color: var(--v-borderline-base);
+  height: 2px;
+  margin-top: var(--margrule);
+  margin-left: 4rem;
+  width: 80%;
+}
+
+.add-event:hover .horiz-rule {
+  display: block;
+}
+
+.custom-event-edit {
+  display: none;
+}
+
+.custom-event:hover .custom-event-edit {
+  display: block;
+  z-index: 100;
+  position: absolute;
+  margin-top: -17px;
+}
+
+.pinned-event-edit {
+  display: none;
+}
+
+.pinned-event:hover .pinned-event-edit {
+  display: block;
+  z-index: 100;
+  position: absolute;
+  margin-top: 10px;
+}
+
+.not-a-custom-event {
+  height: 20px;
+}
+
+.pinned-custom-event {
+  display: block;
+  z-index: 101;
+  position: absolute;
+  margin-top: 10px;
+}
+
+.custom-event:hover .pinned-custom-event {
+  display: none !important;
+}
diff --git a/src/dispatch/static/dispatch/src/vuetify/config.js b/src/dispatch/static/dispatch/src/vuetify/config.js
index f115947556bc..dfe648c74948 100644
--- a/src/dispatch/static/dispatch/src/vuetify/config.js
+++ b/src/dispatch/static/dispatch/src/vuetify/config.js
@@ -25,6 +25,7 @@ export var opts = {
         gray8: "#F0F0F0",
         gray9: "#FAFAFA",
         white: "#FFFFFF",
+        borderline: "#E4E4E4",
       },
       dark: {
         primary: "#E50914",
@@ -49,7 +50,11 @@ export var opts = {
         gray8: "#F0F0F0",
         gray9: "#FAFAFA",
         white: "#FFFFFF",
+        borderline: "#404040",
       },
     },
+    options: {
+      customProperties: true,
+    },
   },
 }
diff --git a/tests/event/test_event_service.py b/tests/event/test_event_service.py
index 274386973eb5..60589701ab53 100644
--- a/tests/event/test_event_service.py
+++ b/tests/event/test_event_service.py
@@ -1,5 +1,6 @@
 import datetime
 from uuid import uuid4
+from dispatch.enums import EventType
 
 
 def test_get(session, event):
@@ -38,6 +39,7 @@ def test_create(session):
         ended_at=ended_at,
         source=source,
         description=description,
+        type=EventType.other,
     )
     event = create(db_session=session, event_in=event_in)
     assert source == event.source
@@ -58,6 +60,7 @@ def test_update(session, event):
         ended_at=ended_at,
         source=source,
         description=description,
+        type=EventType.other,
     )
     event = update(db_session=session, event=event, event_in=event_in)
     assert event.source == source