diff --git a/common/images/SWHAP-CMM-cnt-reference.png b/common/images/SWHAP-CMM-cnt-reference.png
new file mode 100644
index 0000000..10d17f0
Binary files /dev/null and b/common/images/SWHAP-CMM-cnt-reference.png differ
diff --git a/common/images/SWHAP-CMM-full-history-SWH.png b/common/images/SWHAP-CMM-full-history-SWH.png
new file mode 100644
index 0000000..d1b6e13
Binary files /dev/null and b/common/images/SWHAP-CMM-full-history-SWH.png differ
diff --git a/common/images/SWHAP-CMM-master.png b/common/images/SWHAP-CMM-master.png
new file mode 100644
index 0000000..7059e6b
Binary files /dev/null and b/common/images/SWHAP-CMM-master.png differ
diff --git a/common/images/SWHAP-CMM-source-code.png b/common/images/SWHAP-CMM-source-code.png
new file mode 100644
index 0000000..8513381
Binary files /dev/null and b/common/images/SWHAP-CMM-source-code.png differ
diff --git a/common/images/SWHAP-template-classes.png b/common/images/SWHAP-template-classes.png
new file mode 100644
index 0000000..d31f8c7
Binary files /dev/null and b/common/images/SWHAP-template-classes.png differ
diff --git a/talks-public/2021-06-21-SWHAP-tech-talk/2021-06-08-SWHAP-tech-talk.org b/talks-public/2021-06-21-SWHAP-tech-talk/2021-06-08-SWHAP-tech-talk.org
new file mode 100644
index 0000000..3144565
--- /dev/null
+++ b/talks-public/2021-06-21-SWHAP-tech-talk/2021-06-08-SWHAP-tech-talk.org
@@ -0,0 +1,90 @@
+#+COLUMNS: %40ITEM %10BEAMER_env(Env) %9BEAMER_envargs(Env Args) %10BEAMER_act(Act) %4BEAMER_col(Col) %10BEAMER_extra(Extra) %8BEAMER_opt(Opt)
+#+TITLE: Software Heritage
+#+SUBTITLE: Legacy software archival with the SWH Acquisition Process
+#+BEAMER_HEADER: \title{Software Heritage}
+#+AUTHOR: Morane Gruenpeter
+#+EMAIL: morane@softwareheritage.org
+#+BEAMER_HEADER: \date[June 21th, 2020]{June 21th, 2020\\[-1em]}
+#+BEAMER_HEADER: \title[www.softwareheritage.org]{Software Heritage}
+#+BEAMER_HEADER: \institute[]{\\\href{mailto:morane@softwareheritage.org}{\tt morane@softwareheritage.org}}
+#+BEAMER_HEADER: \author[Morane Gruenpeter]{ Morane Gruenpeter\\[1em]%
+#+BEAMER_HEADER: Software Heritage\\[-1em]}
+# #+BEAMER_HEADER: \setbeameroption{show notes on second screen}
+#+BEAMER_HEADER: \setbeameroption{hide notes}
+#+KEYWORDS: software heritage legacy preservation knowledge mankind technology deposit
+
+#
+# prelude.org contains all the information needed to export the main beamer latex source
+# use prelude-toc.org to get the table of contents
+#
+
+#+INCLUDE: "../../common/modules/prelude-toc.org" :minlevel 1
+
+
+#+INCLUDE: "../../common/modules/169.org"
+
+# +LaTeX_CLASS_OPTIONS: [aspectratio=169,handout,xcolor=table]
+#+LATEX_HEADER: \usepackage{bbding}
+#+LATEX_HEADER: \usepackage{tcolorbox}
+#+LATEX_HEADER: \DeclareUnicodeCharacter{66D}{\FiveStar}
+
+
+#
+# If you want to change the title logo it's here
+#
+# +BEAMER_HEADER: \titlegraphic{\includegraphics[width=0.7\textwidth]{SWH-logo}}
+
+# aspect ratio can be changed, but the slides need to be adapted
+# - compute a "resizing factor" for the images (macro for picblocks?)
+#
+# set the background image
+#
+# https://pacoup.com/2011/06/12/list-of-true-169-resolutions/
+#
+#+BEAMER_HEADER: \pgfdeclareimage[height=90mm,width=160mm]{bgd}{swh-world-169.png}
+#+BEAMER_HEADER: \setbeamertemplate{background}{\pgfuseimage{bgd}}
+
+#+LATEX_HEADER: \usepackage{supertabular}
+#+LATEX_HEADER: \newcommand{\sponsor}[2]{{\bf #1}, #2}
+#+LATEX_HEADER: \newcommand{\teamster}[2]{{\textcolor{red}{#1}}, #2}
+
+
+
+
+* Software Heritage Acquisition Process (SWHAP)
+#+INCLUDE: "../../common/modules/turningpoint.org::#main" :only-contents t :minlevel 2
+
+# SWHAP - Legacy Software Acquisition Process (three slides)
+# - why it is important (it is time)
+# - The four phases: collect, curate, archive and present
+# - An example on Github
+#+INCLUDE: "../../common/modules/swh-acquisition-process.org::#main" :only-contents t :minlevel 2
+* The Software Stories new project
+** Software Stories
+*** Goal
+  - Create dedicated presentations of the curated materials
+  - Showcase legacy software in a virtual exposition
+  - see https://sciencestories.io example
+
+*** Actors
+  - SWH team: Roberto and Morane (project management)
+  - Science-stories team: Kat and Kenneth (design and implementation)
+  - Pisa team: Carlo, Guido and Laura (testing and guides)
+
+** The activity plan
+*** Stage 1: Design & Prototype implementation
+  - Design the data model
+  - Define a “formal language” for storyboards of SWH stories
+  - Define a high-level architectural design for the “render engine”
+  - Develop rendering engine
+  - Test prototype
+
+*** Stage 2: Design a meta-process for the curation of stories as part of the SWHAP
+  - Develop the process for creation and maintenance of SWH stories
+  - Create a curator guide to assist curators in the process of legacy software preservation
+
+
+
+
+
+
diff --git a/talks-public/2021-06-21-SWHAP-tech-talk/METADATA b/talks-public/2021-06-21-SWHAP-tech-talk/METADATA
new file mode 100644
index 0000000..96b588a
--- /dev/null
+++ b/talks-public/2021-06-21-SWHAP-tech-talk/METADATA
@@ -0,0 +1,18 @@
+Title:
+ Software Heritage: the universal source code archive
+
+Abstract:
+
+ Software source code is everywhere, with tens of millions of developers
+ worldwide, and it is of paramount importance to provide a universal
+ archive and reference system for all its applications. Software Heritage
+ has taken over this task.
+
+ Since software source code has been recently recognised as an important
+ asset also in the field of scientific research, complementing publications
+ and research data, Software Heritage is now providing the infrastructure
+ for depositing and referencing software source code, in collaboration with
+ national and international open access portals.
+
+ In this short presentation we will provide an overview of the available
+ functionalities, and an update on the latest collaborations.
diff --git a/talks-public/2021-06-21-SWHAP-tech-talk/Makefile b/talks-public/2021-06-21-SWHAP-tech-talk/Makefile
new file mode 100644
index 0000000..68fbee7
--- /dev/null
+++ b/talks-public/2021-06-21-SWHAP-tech-talk/Makefile
@@ -0,0 +1 @@
+include ../Makefile.slides