diff --git a/workshop/_toc.yml b/workshop/_toc.yml
index b8f673f..dea0f4a 100644
--- a/workshop/_toc.yml
+++ b/workshop/_toc.yml
@@ -6,5 +6,12 @@ root: intro
chapters:
- file: coc
- file: agenda
+- file: terminology
+- file: current
+- file: fair_os
- file: registration
-
+- file: example
+- file: exercises
+- file: collaboration
+- file: next
+- file: feedback
diff --git a/workshop/agenda.md b/workshop/agenda.md
index b383bd2..f1c1308 100644
--- a/workshop/agenda.md
+++ b/workshop/agenda.md
@@ -3,8 +3,8 @@
This section presents the agenda for the Workshop.
- Welcome and logistics 🗣️ (⏰ 10 min)
-- A short introduction to EOSC terminology (⏰ 10 min)
-- Discussion on current working practices and bottlenecks (⏰ 15 min)
+- A short introduction to EOSC and its terminology (⏰ 10 min)
+- Discussion on current research practices and bottlenecks (⏰ 15 min)
- FAIR and Open Science: an additional burden for scientists or an opportunity (⏰ 10 min)
- Break 😌 (⏰ 15 min)
- Getting started with EOSC (⏰ 20 min)
diff --git a/workshop/collaboration.md b/workshop/collaboration.md
new file mode 100644
index 0000000..f735b17
--- /dev/null
+++ b/workshop/collaboration.md
@@ -0,0 +1 @@
+# Why and how getting involved
diff --git a/workshop/current.md b/workshop/current.md
new file mode 100644
index 0000000..6750d5b
--- /dev/null
+++ b/workshop/current.md
@@ -0,0 +1,3 @@
+# Discussion on current working practices and bottlenecks
+
+
diff --git a/workshop/example.md b/workshop/example.md
new file mode 100644
index 0000000..23b4385
--- /dev/null
+++ b/workshop/example.md
@@ -0,0 +1,2 @@
+# Work along session with an example
+
diff --git a/workshop/exercises.md b/workshop/exercises.md
new file mode 100644
index 0000000..2056b44
--- /dev/null
+++ b/workshop/exercises.md
@@ -0,0 +1 @@
+# Try it out yourself
diff --git a/workshop/fair_os.md b/workshop/fair_os.md
new file mode 100644
index 0000000..5c9c5c4
--- /dev/null
+++ b/workshop/fair_os.md
@@ -0,0 +1,16 @@
+# FAIR and Open Science
+
+## Introduction to FAIR and Open Science concepts
+
+- You can find a short introduction to the FAIR principles and Open Science concepts in the slides below.
+
+
+
+
+
+
+
+
+## An additional burden for scientists or an opportunity
diff --git a/workshop/feedback.md b/workshop/feedback.md
new file mode 100644
index 0000000..f77fb13
--- /dev/null
+++ b/workshop/feedback.md
@@ -0,0 +1,2 @@
+# Providing feedback
+
diff --git a/workshop/next.md b/workshop/next.md
new file mode 100644
index 0000000..c830877
--- /dev/null
+++ b/workshop/next.md
@@ -0,0 +1,2 @@
+# Discussion, summary and next steps
+
diff --git a/workshop/registration.md b/workshop/registration.md
index 8c30e86..c597ce0 100644
--- a/workshop/registration.md
+++ b/workshop/registration.md
@@ -1,4 +1,6 @@
-# Registration & Access to EOSC
+# Getting started with EOSC
+
+## Registration & Access to EOSC
To access most EOSC services, we recommend using EGI Check-in so we first need to register to EGI Check-in:
@@ -19,6 +21,6 @@ To access most EOSC services, we recommend using EGI Check-in so we first need t
![successful EGI SSO registration](images/EGI-SSO-success.png)
-## Registration and access to EOSC service
+## Enrollment to a VO to access an EOSC service
diff --git a/workshop/terminology.md b/workshop/terminology.md
new file mode 100644
index 0000000..36189d2
--- /dev/null
+++ b/workshop/terminology.md
@@ -0,0 +1,35 @@
+# A short introduction to EOSC and its terminology
+
+## EOSC
+
+ **EOSC**: European Open Science Cloud. *The European Open Science Cloud is a European Commission initiative aiming at developing an infrastructure providing its users with services promoting open science practices (Wikipedia).*
+
+
+
+
+
+
+
+
+## Glossary
+
+- **EOSC**: European Open Science Cloud
+
+- **EOSC portal**: The [EOSC Portal](https://eosc-portal.eu/) is part of the EOSC implementation roadmap as one of the expected “federating core” services contributing to the implementation of the “Access and interface” action line. It has been conceived to provide a European delivery channel connecting the demand-side and the supply-side of the EOSC and all its stakeholders. [Learn more](https://eosc-portal.eu/about/eosc-portal)
+
+- **Marketplace**: The [Marketplace](https://marketplace.eosc-portal.eu) is the EOSC Portal tool where researchers can discover, order and access the services, analytical tools, data management tools, storage and computing services they need for their work.
+
+- **EOSC service**: It can be either an online service (e.g. a web portal or a web service) or it can be a 'human' service, such as training and consultancy. A service brings value to users and facilitates them to implement Open Science.
+
+- **VO**: In the context of EOSC, **VO** stands for Virtual Organisation. A Virtual Organisation (VO) is a group of users. VOs are created to group researchers who aim to share resources and access services to achieve a common goal as part of a scientific collaboration. VOs can also be organised in a hierarchical structure for creating groups or subgroups within a VO.
+
+- **Enrolling to a VO**: For most EOSC services, users need to register to the given service before being able to use it. This is done by **enrolling to a VO** that is associated to a given service.
+
+
+- **EGI Check-in**: [EGI Check-in](https://www.egi.eu/service/check-in/) is a proxy service that operates as a central hub to connect federated Identity Providers (IdPs) with EGI service providers.
+
+
+You can find many more definitions of terms used within the EOSC context at the [EOSC Glossary](https://eosc-portal.eu/about/glossary).
+