Index: script,lightning.txt
==================================================================
--- script,lightning.txt
+++ script,lightning.txt
@@ -35,9 +35,37 @@
   best effort basis, and as few hardwired management mechanisms as possible.
 - Supporting the peculiarities of CNs: distributed ownership, fairness between
   users, diversity but also instability.
 - All Community-Lab's software and documentation is “free as in freedom” so
   you can use it to setup your own CONFINE testbed. *##*
+
+** Community-Lab as community infrastructure
+
+- CONFINE can help physically extend CNs with new Community-Lab nodes.
+- Nodes can also host services like web servers, video broadcast
+  stations, etc.
+- Nodes can also be used as infrastructure for cloud infrastructure provided
+  and managed by the community for the community: Clommunity project. *##*
+
+* Architecture and technologies
+** Testbed architecture
+- Community-Lab consists of a set of nodes (managed by CN members) that follow
+  the configuration in a set of servers (managed by testbed operators).
+- All components in the testbed become reachable via a management network,
+  implemented as a VPN IPv6 overlay.
+- Researchers define experiments (so called slices) in a server.
+- Nodes use a REST API to get those definitions from servers and run several
+  of them simultaneously as VMs (so called slivers). *##*
+
+** Technologies
+- Nodes are connected via Ethernet to normal community devices.
+- Nodes are moderately powerful computers running OpenWrt with a daemon
+  written in Lua.  Slivers are implemented as Linux containers.  We are
+  working on safe node upgrade using kexec.
+- The GUI and REST API in servers are implemented as Django applications.
+- The management network overlay is a tinc mesh VPN.
+- We use Git, Redmine, Jenkins and our Virtual CONFINE Tesbed (VCT) package
+  for development and testing.
 
 # Local Variables:
 # mode: org
 # End:

Index: slides,lightning.txt
==================================================================
--- slides,lightning.txt
+++ slides,lightning.txt
@@ -35,30 +35,32 @@
     - Best effort
     - Unbundled management
 - Heavily customized for CNs:
     - Some decentralization
     - Fair to other users  
-      (no low-level, disruptive experiments, no spying)
+      (no spying, no low-level, routing & above)
     - Simple, tolerant to network failures
 - Free software: build your own testbed!
 
 # Community-Lab as community infrastructure
 
-- CONFINE extends CNs with Community-Lab nodes
+- Extend CNs with Community-Lab nodes
+<!--- Figure from IS4CWN slide #15 --->
 - Community-Lab for hosting services
 - [Clommunity](http://clommunity-project.eu/): community clouds
 
 # Architecture and technologies
 
+<!--- testbed architecture diagram --->
 - Testbed
-- Slices and slivers
-- Node hardware (CD and RD)
-- Django
-- OpenWrt
-- LXC
-- kexec
-- tinc
+    - Nodes, servers, management network
+    - Researchers, slices and slivers
+<!--- overlay logos on top of diagram --->
+- Nodes: OpenWrt, Lua, LXC, kexec
+- Servers: Django
+- Management network: tinc
+- Software development: Git, Redmine, Jenkins, VCT
 
 # Collaborations
 
 - [OpenWrt](https://openwrt.org/)
 - [BMX6](http://bmx6.net/)