diff --git a/draw.io/iaas-aas.xml b/draw.io/iaas-aas.xml
new file mode 100644
index 0000000..00d16bd
--- /dev/null
+++ b/draw.io/iaas-aas.xml
@@ -0,0 +1 @@
+7VpNc6M4EP01rpq5uEACDMdJMrt7mK1KVQ6zc3LJkgBtAFFCju359StAYCPwhLIN2ZokOQRaX633uqXuJgt4n+7/FCiP/+aEJgtgkf0CPiwAsB1oqT+l5FBL/MCuBZFgRHc6Cp7YT6qFely0ZYQWnY6S80SyvCvEPMsolh0ZEoLvut1CnnRXzVFEe4InjJK+9DsjMta7AN5R/hdlUdysbHtB3bJB+DkSfJvp9RYA2kH5WzenqJlLb7SIEeG7ExH8uoD3gnNZP6X7e5qU2Daw1eP+ONPa6i1oJkcN8OsRLyjZ0kblSjF5aMBodbQW8I6gIqZEv8QyTdSjrR4LKfgzvecJF0qS8YyWwhjl5STpPirtZJkWGNGlUo2KXLCCLgnH27RS9S5kSdIMV6hZlu37D0qu9aNC0v3ZTdotdMokKU+pFAfVRQ+AjTlqa4QrWL/vjtw6ukt8QqurZUhbU9TOfERUPWhQzwC8egcAO9DtAOzY7nwAe+8AYNc1LNibD2AwCb4KIOjBAJI+cGGI1Y+SJ2hDk0deMMl4ptpwhbtqKLFk6rT+ZnTYcCl5etLhS8KiskHyfIBM9HMr6BInfEvWBRUvDNMb+YPfpQusnB5d7gBdzg3ogpPTNTUttY9VtCxjwrKiBmjITIJgmhvCDqxRhEHvesKcD8Iu8LDV2xE2zY3+ywMxDH1/tgNxm6ngO5MsZJSssYrt13zzbxVl34Q5q8ucY4FxZyO4nrlpgt1fMIcJ3fib34Q5F5hByDifuwVzwevM0Yx8KVO/Et0EFQXDFVNIyL64x2WT5YFh7wvDIdbvqt8WXEp6SaUBrdKXbwXWvbxhtF9Bs5EJmiDJXrorDkGsV3jkTOnSkgmCLpktuc0UtaZ61GkGaUxk+jM0J1IMRFT2JqoYb7c9LtS3Z7SC69l+K2od0M3GYHApteZEcDpqR2QZH9QCx8gDgX8ptUb8BCakdkRG8kFt7xy9mFo4I7Xu69ReXnuZM20hSKJ1iLDk5d77pZxV8ODdKv71u/SsdGxzWspZ9c2skV0TRU1TKvv/lHKmjX/NkGnO+NceEQC/CiXSELbgn+N3HOY5I8uUFXiJefZCD1ysP6mF5efewQwNw9D+jYq8/nYTsn2pxRR1AWj3K2+2NUBSE+pcVSm15vavmfPLCUqlrmPcVjOWSu0RfM0QmSikxOGf0gqWTvP6Q89TvTxSwdTmSj4rSxkbynTTTX3t1Lf/qcG+VcSzMoquva8VYyMezyi3O9NFPGBECrqLmaRPOaqA3yn36ZpG6/R9OzlzUCoXJExRa36bGgqabnHPGUmGPXDPtXdfp7hqpv4jnFK9Hr9214Qc/6UAfv0P
\ No newline at end of file
diff --git a/draw.io/iaas-ops.xml b/draw.io/iaas-ops.xml
new file mode 100644
index 0000000..9d6197d
--- /dev/null
+++ b/draw.io/iaas-ops.xml
@@ -0,0 +1 @@
+7Zhdc6MgFIZ/jbcdBWPiZZN2dy92ZzqTi73sEEBli5JBbJL++sWIX2i2yTZJO51OLiKHDw/vczgCDlyk2+8SrZNfglDuAJdsHXjnAOD50NV/pWVXWWahVxliyYhp1BqW7IUao+kXF4zQvNdQCcEVW/eNWGQZxapnQ1KKTb9ZJHj/rWsU04FhiREfWn8zohIzCxC09h+UxUn9Zi8Iq5oVwk+xFEVm3ucA6IXlr6pOUT2WmWieICI2HRO8d+BCCqGqp3S7oLzUtpat6vftQG3jt6SZOqqDX/V4Rrygtct7x9SuFmOTMEWXa4TL8kYDd+A8USnXJU8/EpQnlJhCrqR4ajSD2hIxzheCC6nLmcj0GPNYIsK0g5a56msZjXtUKro9OEevUU5HJBUpVXKnm5gOYGLENsHoBaa8adHC2pZ0sMKaEjLhFDdjt5LqB6PquMLgdYGbIHC7crp9mUfV6YqrQ811p+FdoO0crSh/EDlTTGS6DmupqG40L4VkOs5/Wg1WQimRdhrcchaXFUqUuLWH69LZdBuXC/4GvRSS3mAuCvKYU/nMcMtqAGYE30FWvttnBWZDVpMRVP4ZSMGLkNJYYABDSK6AJc0xMlhuEsKyvBLIDpMowjgMzwMMQmtxhccBg8HbgR2Ru76ADVbY9P2ABRcHNiIcxldLiEWmty2ZYhGj5BHrXdGjWP3Z70/OQQ6EfXJw5Ds2mhvB28lNr08uimazT0LO/qr5Lrgaudm1yWFCV7PVJyE3Ae+35sLXydGM3JbHnVJdjvKc4T0pJNXQPGBZ79LB+OqLojHq8/3vX+LmopCY9hI+Jb3j1lDtV9SsbZJypNhz/5A2JrF5w4Ng2rmDCXRi7+8r102v7qnJGshez4ODgiYQUzUYaE+8mfZRQVCfiK8SBW+kbVJNNXmne/r5IAEwtTarzbinBgD0rYQ+vVwA1DnrgwbAB0Hrg0l/SYb/u7btgeDl0B5xN/CFFvjW/U1zJ3AyWuvoAy6I9ojLhC+0h697Tk7IF0Ori+11bNW8vfOG938B
\ No newline at end of file
diff --git a/draw.io/iaas-sad.xml b/draw.io/iaas-sad.xml
new file mode 100644
index 0000000..1705690
--- /dev/null
+++ b/draw.io/iaas-sad.xml
@@ -0,0 +1 @@
+7ZhLb6MwEIB/DdcqsQmBY5PNtoddqVKl3WPl2Aa8NRgZk6T99WvAkBiSLX2ERqsqh5jxazzf2B6PA5fJ7kaiLP4pCOUOmJCdA785AExdONF/peSplvjBtBZEkhHTaC+4Z8/UCE2/qGCE5lZDJQRXLLOFWKQpxcqSISnF1m4WCm7PmqGI9gT3GPG+9DcjKjarAN5efktZFDczT72grlkj/BhJUaRmPgfAaVD+6uoENWOZheYxImJ7IIIrBy6lEKouJbsl5aVtG7PV/b6fqG31ljRVQzqAusMG8YI2Gld6qafGFq2KEwcuCMpjSsxHrBKui1NdzJUUj3QpuJBVL7j2Z+6sbBQyzg/kq2tv4XlaztGa8juRM8VEquuw1pjqRosNlYppFD86DdZCKZEcNLjmLCorlMhKDWKUlRonu6j0ySv0XEh6hbkoyENO5YZhXbvQdYTpmRqNUpGW4r7ZjCXLuejuQGTMeENFQpV80k1MrTsxSI3LA998b/cONDOi+MB3XCNDxmWjduQ9Nl0w5I5ThOeiCD0YQDICrSTHyNC6iglL89pAXe8JQ4yD4GOAQWgDmwbDgEHv/cDcL2Bv2GHzzwPmnR3YEcNhPNo5WaT6wk0VCxklD1jf5w9i/ae6WRchZ9kvo/4HUASBTRF6A89J8H6K8/EphqHv/4cUu7edOwGjUfTHpogJXfvrS6F4a1bywURn4PP2ZfAyUZqS6zKwL63OUZ4zXBFEUvXFPcZNDA+O79AwPOYNi+r3L+PmopCYWhcEJdbDom/tF6zZyCTlSLGN/Rw5ZmIzw51gWrmTh2wLtxmiVt30OnwfdAbq7nPYHUgTiKjqDVQRb5c9yAmat98oXvBO2uYIqhfvHL6kLsQB5p3gth33tQ4A3c5BPz+fAzRn1oU6wIWgdcHM3pLBW/d2dyB4PrQD8gxfaIE76+xa/61oO08lcEa0A5IPX2hPp4defSCPiHZAmmIbM0XvM1TdjFsdxdoI29i7zxN2gjGTijuRobPJW2m7Xox7xA9OP0c7W256JOxtQ2Erq9CNhAYEvvpzn9qtgezz53D1Fw==
\ No newline at end of file
diff --git a/draw.io/iaas-service.xml b/draw.io/iaas-service.xml
new file mode 100644
index 0000000..cfdf314
--- /dev/null
+++ b/draw.io/iaas-service.xml
@@ -0,0 +1 @@
+lVTLboMwEPwarhHgNE2OTfo6tFKlHHqsHLw1Vg2LjCkkX991MK881FYc8M7u2uOZhYBtsubJ8CJ9RQE6iEPRBOw+iONozkJ6OWTfIstV1ALSKOGLBmCrDuBB3ycrJaCcFFpEbVUxBRPMc0jsBOPGYD0t+0Q9PbXgEs6AbcL1OfquhE39LeLFgD+Dkml3crRYtZkdT76kwSr35wUxi1buadMZ7/byFy1TLrAeQewhYBuDaNtV1mxAO2072dq+xyvZnreB3P6pYd52fHNdQUf5SMzuOzHqVFnYFjxxcU2GB2yd2kxTFNFS8DIF4YPSGvzqNWOEfCqtN6jRUJxjTnuspeFCEcETuO09AT09MBaaq3eMeuVoIgEzsGZPJb4hvvFi+2GMFj6uB2tZh6UjW1nnEvfjJPu9B0lp4VW9rHD8u8D9EIRjOcOpzBfVGYtLoxaGt6v7BeGa70C/YamswpxyCUkFVLR2Qiqa85eTgh1ai9mo4E4r6RIWnd3EsHBks0a6D37GD5WBWaKxEh8lmG+VDF6dGXPBvqtezcOpV/Hy3KubC1bN/+8UhcN3dsyNfmbs4Qc=
\ No newline at end of file
diff --git a/draw.io/iaas-users.xml b/draw.io/iaas-users.xml
new file mode 100644
index 0000000..d515b2c
--- /dev/null
+++ b/draw.io/iaas-users.xml
@@ -0,0 +1 @@
+3ZfLcpswFIafhm0GJHxhGTtpu2hnMuNFlx5ZOoAagTxC+JKnrzDCWIDrTC6uJ/bC6NeFo/870hx7eJ7tviuyTn9JBsJDPtt5+MFDKAixb34qZV8r0yiohURxZge1woK/gBXtvKTkDApnoJZSaL52RSrzHKh2NKKU3LrDYinct65JAj1hQYnoq78506ndBRq3+g/gSdq8ORhHdc+K0OdEyTK37/MQDqLqW3dnpFnLbrRICZPbEwk/eniupNT1U7abg6i8bWyr530703uMW0GuXzUhrGdsiCihCfkQmN43ZmxTrmGxJrRqbw1wD89SnQnTCswjI0UKzDYKreTz0TNslJgLMZdCKtPOZW7WmCWKMG4C7Mj13I5owwOlYXd2j8HROZORIDPQam+G2AloZM22yRiMbXvbosWNlp5gxQ0lYtMpOa7dWmoerKvDDqPLBh+TwD+103dtHnTn1FyTar4/iR7GRhdkBeJJFlxzmZs+aqwCM2hWGclNnv/sDFhJrWV2MuBe8KTq0LLCbSJcV8Fmu6Q68HfkpVRwR4Us2bIAteG0ZdUDM4DvLKvQd1mhaZ/VaABV+AGkxp9CymDBYxxh1scVx9R8roarzM2lmmsec2BLau7spVz9OdyeH0EORS45PHDKBsmh95ObXJ9cHE+nX4Rc98yFProauem1yVEGq+nqi5Abof935qLL5CBn91UxVrkrSFFweiBFlO7LPZZNDYGGT18cD1GfHb7/MreQpaLgXPjAnGKw7/YFNxtNgSCab9wScshi+4YnyU1wZy/QUbf6qEO3s05rus5C3fPcK2MMgQR0b6ED8eO2X5UETb1+lSx4J2171dSbd2qzG0mACe7UPqM3JgAOOxf65PMSoLmzbjQBbgRtiEbukYzeera7C+GPQmua7d/Oenj73x4//gU=
\ No newline at end of file
diff --git a/media/iaas-aas.png b/media/iaas-aas.png
new file mode 100644
index 0000000..c4efa05
Binary files /dev/null and b/media/iaas-aas.png differ
diff --git a/media/iaas-ops.png b/media/iaas-ops.png
new file mode 100644
index 0000000..c0f4403
Binary files /dev/null and b/media/iaas-ops.png differ
diff --git a/media/iaas-sad.png b/media/iaas-sad.png
new file mode 100644
index 0000000..424f0cd
Binary files /dev/null and b/media/iaas-sad.png differ
diff --git a/media/iaas-service.png b/media/iaas-service.png
new file mode 100644
index 0000000..f4c5661
Binary files /dev/null and b/media/iaas-service.png differ
diff --git a/media/iaas-users.png b/media/iaas-users.png
new file mode 100644
index 0000000..a8f4c34
Binary files /dev/null and b/media/iaas-users.png differ
diff --git a/notes/iaas-aas.md b/notes/iaas-aas.md
new file mode 100644
index 0000000..7db05c7
--- /dev/null
+++ b/notes/iaas-aas.md
@@ -0,0 +1,139 @@
+---
+title: Infrastructure-as-a-Service as a Service
+sansfont: DejaVu Sans
+slide-numbers: true
+biblatex: true
+biblatex-chicago: true
+biblatexoptions: [notes, noibid]
+bibliography: ../sources.bib
+links-as-notes: true
+---
+
+# Building things \newline
+that build things \newline
+for people who build things \newline
+to build things with
+
+## Definition: infrastructure\footnote{\cite{oed:infrastructure}}
+
+1. \alert{noun} The basic physical and organizational structures and facilities
+ [...] needed for the operation of a society or enterprise.
+
+## Definition: service\footnote{\cite{oed:service}}
+
+1. \alert{mass noun} The action of *helping* or doing work for *someone*.
+ 1. \alert{count noun} An act of assistance.
+
+## Infrastructure
+
+\begin{center}
+\includegraphics[width=5\TPHorizModule]{../media/iaas-service.png}
+\end{center}
+
+## Infrastructure
+
+\begin{center}
+\includegraphics[width=5\TPHorizModule]{../media/iaas-users.png}
+\end{center}
+
+## Infrastructure as a service
+
+\begin{center}
+\includegraphics[width=5\TPHorizModule]{../media/iaas-ops.png}
+\end{center}
+
+## Infrastructure as a service
+
+\begin{center}
+\includegraphics[width=5\TPHorizModule]{../media/iaas-sad.png}
+\end{center}
+
+## Infrastructure-as-a-service as a service
+
+\begin{center}
+\includegraphics[width=5\TPHorizModule]{../media/iaas-aas.png}
+\end{center}
+
+## Infrastructure as code
+
+Application is executable + environment
+
+- Version control environment definition
+- Automate environment creation
+- Test environment at deploy
+
+## Pipeline environment configuration
+
+\tiny
+
+```json
+{
+ "apiVersion": "v1",
+ "kind": "Template",
+ "metadata": {
+ "creationTimestamp": null,
+ "name": "hybris"
+ },
+ "objects": [
+ {
+ "kind": "ImageStream",
+ "apiVersion": "v1",
+ "metadata": {
+ "name": "${NAME}-runtime",
+ "labels": {
+ "app": "hybris",
+ "role": "jenkins-slave"
+ },
+ "annotations": {
+ "description": "Hybris application image. This image is the production image."
+ }
+ }
+ },
+ ... 740 more lines
+```
+
+## Pipeline configuration
+
+\tiny
+
+```js
+node() {
+ checkout scm
+
+ /** Stash doesn't include empty folders (.gitignore gets filtered out) **/
+ sh '''
+ zip -r 'hybris-custom.zip' 'hybris/bin/custom'
+ '''
+
+ /** Stash stuff we need on hybris5-builder nodes **/
+ stash(name: 'bilkadk-src-zip', includes: 'hybris-custom.zip')
+ stash(name: 'hybris-config', includes: 'hybris/config/**')
+ stash(name: 'bilkadk-tools', includes: 'tools/**,build.xml')
+ stash(name: 'bilkadk-ENV', includes: 'ENV/**')
+ stash(name: 'bilkadk-selenium', includes: 'hybris/bin/custom/bilkadk-acceptance/**')
+
+ /** Openshift uses local.properties from ENV **/
+ sh '''
+ cp 'ENV/local_openshift.properties' 'hybris/config/local.properties'
+ '''
+}
+... 500 more lines
+```
+
+## Obstacles
+
+> - Secret secrets
+> - Nothing to be done
+> - Service maintenance
+> - Education; "you just have to\ldots"
+> - Ownership; forced if necessary
+> - Service-service maintenance
+> - Coordinate migration window
+> - Ops: provide window
+> - Dev: migrate
+> - Staggered rollout
+> - Competing stakeholders
+
+## Summary
+
+Remembering to work *with* each other, not *next to* each other
diff --git a/notes/notes-sample.md b/notes/notes-sample.md
deleted file mode 100644
index add66e8..0000000
--- a/notes/notes-sample.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-title: A Sample Set of Slides
-author: Your Name Here
-date: Totally Not the Last Minute
-sansfont: DejaVu Sans
-slide-numbers: true
----
-
-# An ordinary slide
-
-With some text.
-
-## And a block
-
-And some text underneath.
-
-
-\note{
-
-Here are my notes.
-
-}
-
-# Another slide
-
-- With a
-- list.
-
-\note{
-
-A note on my list.
-
-}
-
-# A slide to show overlay tricks
-
-\only{<1,3>}{This text appears on the first and third versions of the slide, but not the second.}
-
-This uses beamer's highlighting command to \alert{<2>}{draw attention here}, but only on the second slide.
-
-\note{<1>}{
-
-Notes can also have overlay specs. First slide version note.
-
-}
-
-\note{<2>}{
-
-Second.
-
-}
-
-\note{<3>}{
-
-And third. Use \LaTeX\ macros in notes, like \emph{emphasis}.
-
-}
-
-# TeX-LOGO
-
-\begin{textblock}{4}(0,1)
-Grid demo UL
-\end{textblock}
-
-\begin{textblock}{4}(7,1)
-Grid demo UR
-\end{textblock}
-
-\begin{textblock}{4}(0,5)
-Grid demo LL
-\end{textblock}
-
-\begin{textblock}{4}(7,5)
-\only<2>{Grid demo LR}
-\end{textblock}
-
-\note{<2>}{
-
-To get overlay effects with materials placed using \texttt{textpos}, you have to specify the overlay within the \texttt{textblock} environment.
-
-}
diff --git a/sources.bib b/sources.bib
index 0f15495..7e8fcdf 100644
--- a/sources.bib
+++ b/sources.bib
@@ -1,16 +1,13 @@
-@book{bringhurst:elements,
- author={Bringhurst, Robert},
- title={The Elements of Typographic Style},
- edition={version 3.2},
- publisher={Hartley \& Marks},
- location={Point Roberts, WA},
- date={2008}
+@online{oed:infrastructure,
+ title = {infrastructure},
+ url = {https://en.oxforddictionaries.com/definition/infrastructure},
+ urldate = {2017-12-29},
+ publisher = {Oxford Dictionaries}
}
-@artwork{diablo:projector,
- author={Diablo, Mailer},
- title={Overhead Projector in Operation During a Classroom Lesson},
- institution={\href{https://commons.wikimedia.org/w/index.php?curid=525127}{Wikimedia Commons}},
- date={2006},
- note={CC-BY-SA 3.0}
+@online{oed:service,
+ title = {service},
+ url = {https://en.oxforddictionaries.com/definition/service},
+ urldate = {2017-12-29},
+ publisher = {Oxford Dictionaries}
}