diff --git a/README.md b/README.md
index ba7940f5..718b8c76 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,10 @@ The android examples have only been tested on NVIDIA hardware yet.
 
 The examples are build against **API Version 1.0.3** and support **implementations starting with 1.0.1**. This ensures that beta drivers not updated to the most recent API-Version can run the examples.
 
+## Additional documentation
+
+Additional documentation for several base classes and functionality (e.g. the swap chain) can be found [in this directory](./documentation/additionaldocs.md).
+
 ## Examples
 
 ## [Triangle](triangle/)
@@ -205,10 +209,6 @@ This repository also contains a few Android examples that are (for now) separate
 
 The examples already share a few source files with existing examples and might be integrated into them at some point.
 
-## Additional documentation
-- [Vulkan example base class](./documentation/examplebaseclass.md)
-- more to come...
-
 ## Credits
 Thanks to the authors of these libraries :
 - [OpenGL Mathematics (GLM)](https://github.com/g-truc/glm)
diff --git a/documentation/additionaldocs.md b/documentation/additionaldocs.md
new file mode 100644
index 00000000..59be258a
--- /dev/null
+++ b/documentation/additionaldocs.md
@@ -0,0 +1,8 @@
+## Additional documentation
+
+- [Vulkan swap chain class](./swapchain.md)
+- [Vulkan example base class](./examplebaseclass.md)
+- todo
+  - mesh loader
+  - texture loader
+  - etc.
diff --git a/documentation/examplebaseclass.md b/documentation/examplebaseclass.md
index 72f7dc06..6b2237fd 100644
--- a/documentation/examplebaseclass.md
+++ b/documentation/examplebaseclass.md
@@ -40,7 +40,3 @@ if (flags & VK_DBG_REPORT_WARN_BIT)
 }
 
 ```
-## TODO
-- Document helper classes like vulkandebug
-- Document texture loader
-- Document mesh loader
diff --git a/documentation/swapchain.md b/documentation/swapchain.md
new file mode 100644
index 00000000..2a98211d
--- /dev/null
+++ b/documentation/swapchain.md
@@ -0,0 +1,92 @@
+## Swap chain class
+
+
+```cpp
+#include "base/vulkanswapchain.hpp"
+```
+
+The swap chain class connects to the platform specific surface and creates a collection of images to be presented to the windowing system.
+
+A swap chain can hold an arbitrary number of images that can be presented to the windowing system once rendering to them is finished. At minimum it will contain two images, which is then similar to OpenGL's double buffering using a back and front buffer.
+
+### Prerequisites
+
+In order to use the swap chain you need to explicitly request the platform specific surface extension on at instance level :
+
+```cpp
+std::vector<const char*> enabledExtensions = { VK_KHR_SURFACE_EXTENSION_NAME };
+
+// For windows
+enabledExtensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
+
+VkInstanceCreateInfo instanceCreateInfo = {};
+...
+instanceCreateInfo.enabledExtensionCount = enabledExtensions.size();
+instanceCreateInfo.ppEnabledExtensionNames = enabledExtensions.data();
+```
+
+And the swap chain extension at device level :
+
+```cpp
+std::vector<const char*> enabledExtensions = { VK_KHR_SWAPCHAIN_EXTENSION_NAME };
+
+VkDeviceCreateInfo deviceCreateInfo = {};
+...
+deviceCreateInfo.enabledExtensionCount = enabledExtensions.size();
+deviceCreateInfo.ppEnabledExtensionNames = enabledExtensions.data();
+```
+
+### Connecting
+```cpp
+VulkanSwapChain::connect();
+```
+
+### Initializing the surface
+```cpp
+VulkanSwapChain::initSurface();
+```
+This will create the platform specific surface (parameters depend on OS) that's connected to your window. The function also selects a supported color format and space to be used for the swap chain images and gets indices for the graphics and presenting queue that the images will be submitted to.
+
+### Creating the swap chain (images)
+```cpp
+VulkanSwapChain::create();
+```
+Creates the swap chain (and destroys it if it's to be recreated, e.g. for window resize) and also creates the images and image views to be used.
+
+Note that you need to pass a valid command buffer as this also does the initial image transitions for the created images :
+```cpp
+//
+vkTools::setImageLayout(
+  cmdBuffer,
+  buffers[i].image,
+  VK_IMAGE_ASPECT_COLOR_BIT,
+  VK_IMAGE_LAYOUT_UNDEFINED,
+  VK_IMAGE_LAYOUT_PRESENT_SRC_KHR);
+```
+
+### Using the swap chain
+Once everything is setup, the swap chain can used in your render loop :
+```cpp
+...
+// Get next image in the swap chain
+err = swapChain.acquireNextImage(presentCompleteSemaphore, &currentBuffer);
+assert(!err);
+
+// Submit command buffers
+VkSubmitInfo submitInfo = vkTools::initializers::submitInfo();
+...
+err = vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE);
+assert(!err);
+
+// Present current swap chain image to the (graphics) and presenting queue
+err = swapChain.queuePresent(queue, currentBuffer);
+assert(!err);
+...
+
+// The post present barrier is an important part of the render loop
+// It adds an image barrier to the queue that transforms the currentBuffer
+// swap chain image from VK_IMAGE_LAYOUT_PRESENT_SRC_KHR to VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL
+// so it can be used as a color attachment
+submitPostPresentBarrier(swapChain.buffers[currentBuffer].image);
+...
+```