diff --git a/doc/AddressSpacesUsingBuffers.md b/doc/AddressSpacesUsingBuffers.md
new file mode 100644
index 0000000000000000000000000000000000000000..a311db2f4e98dce9b71fec915c0b19c5859358ae
--- /dev/null
+++ b/doc/AddressSpacesUsingBuffers.md
@@ -0,0 +1,44 @@
+#AddressSpacesUsingBuffers
+*Proposal For OpenCL address space support using java Buffers instead of arrays. Updated Dec 8, 2011 by frost.g...@gmail.com*
+The general idea is to have a AS_PRIMTYPE_Buffer for each AS=address space and PRIM=primitive type. Here is an example for LocalFloatBuffer which would be a buffer for floats that got mapped to OpenCL local address space.
+
+As with normal FloatBuffers, the float elements are accessed using get and put methods
+
+Although a LocalFloatBuffer conceptually exists only for the lifetime of a workgroup, it is still constructed in the enclosing Kernel, not in the Kernel.Entry.run method. (Aparapi does not support constructing new objects inside the Kernel.Entry.run method).
+
+A typical declaration would be:
+
+ LocalFloatBuffer locbuf = new LocalFloatBuffer{12);
+The argument 12 here means that 12 floats would be used by each workitem in the workgroup. So the total buffer would be LocalSize*12 floats. Aparapi would at runtime allocate a total local OpenCL buffer to be this size. Note how this removes the need for the programmer to specify localSize anywhere.
+
+Note: For each Kernel.Entry.execute(globalSize) call, the runtime will determine an appropriate workgroup size, also called localSize, depending on the capabilities of the device, and on the globalSize. The localSize will always evenly divide the globalSize, in other words all workgroups for an execute context will be the same size. A workitem can determine localSize by calling getLocalSize().
+
+Because workitems operate simultaneously and in an undetermined order, workitems will generally only use put on its own portion of the LocalFloatBuffer between the LocalBarriers, and will generally only use get outside the LocalBarriers.
+
+Some example code (from NBody) follows. Here each workitem copies a "BODY" consisting of 4 floats. The global array contains 4*globalSize floats, and we want to iterate thru this global array, copying it into local memory and operating on it there. This will take globalSize/localSize "tiles". For each tile, each workitem fills in one "BODY"'s worth or 4 elements
+
+ // outside run method...
+ final int BODYSIZE = 4;
+ LocalFloatBuffer pos_xyzm_local = new LocalFloatBuffer(BODYSIZE);
+ //
+ // inside run method...
+ int numTiles = globalSize / localSize;
+ for (int i = 0; i < numTiles; ++i) {
+ // load one tile into local memory
+ int idx = i * localSize + localId; // index into a global memory array
+ localBarrier();
+ pos_xyzm_local.put(localId * BODYSIZE + 0, pos_xyzm[idx * BODYSIZE + 0]);
+ pos_xyzm_local.put(localId * BODYSIZE + 1, pos_xyzm[idx * BODYSIZE + 1]);
+ pos_xyzm_local.put(localId * BODYSIZE + 2, pos_xyzm[idx * BODYSIZE + 2]);
+ pos_xyzm_local.put(localId * BODYSIZE + 3, pos_xyzm[idx * BODYSIZE + 3]);
+ // Synchronize to make sure data is available for processing
+ localBarrier();
+
+ // now the entire LocalFloatBuffer has been filled.
+ // each workitem might use the entire Buffer
+ // which consists of localSize BODYs
+ for (int j = 0; j < localSize; ++j) {
+ float r_x = pos_xyzm_local.get(j * BODYSIZE + 0) - myPos_x;
+ float r_y = pos_xyzm_local.get(j * BODYSIZE + 1) - myPos_y;
+ float r_z = pos_xyzm_local.get(j * BODYSIZE + 2) - myPos_z;
+ // ...etc
\ No newline at end of file
diff --git a/doc/BuildingNBody.md b/doc/BuildingNBody.md
new file mode 100644
index 0000000000000000000000000000000000000000..092306ac1c0f1975d86b9c2beb6ddbcee596c02a
--- /dev/null
+++ b/doc/BuildingNBody.md
@@ -0,0 +1,40 @@
+#BuildingNBody
+*How to build the NBody example. Updated Nov 11, 2011 by frost.g...@gmail.com*
+##Building NBody
+The NBody example is located in the/ examples subdirectory under the Aparapi trunk:
+
+ trunk/
+ ...
+ examples/
+ ...
+ nbody/
+ src/java/com.amd.aparapi.nbody/
+ build.xml
+ nbody.sh
+ nbody.bat
+The NBody example requires a little more work to build because it depends on a third party project named ‘JOGL’.
+
+JOGL is a set of OpenGL™ bindings for Java® and the NBody example uses this library to render the particles/bodies (potentially many thousands of them) at runtime. More information about JOGL can be found here http://jogamp.org/jogl/www.
+
+The build.xml file build target will download the jars required to build and run the nbody example if the files do not exist.
+
+To build nbody, perform the following commands.
+
+ C:> ant clean build
+The NBody build.xml file includes a ‘run’ target so you can launch the application using.
+
+ C:> ant run
+Or if you prefer to launch from either the nbody.sh or nbody.bat script.
+
+For Linux® we also need to chmod nbody.sh in order to execute it.
+
+ chmod +x nbody.sh
+The nbody scripts take the execution mode as the first argument, the number of bodies as the second argument, and then the height and width (in pixels).
+
+Windows example:
+
+ C:> nbody GPU 32768 800 800
+Linux example:
+
+ $ ./nbody.sh GPU 32768 800 800
+Attribution
\ No newline at end of file
diff --git a/doc/README.md b/doc/README.md
index 574b69ffb84033a77d86698bdcf9e7ffaeb175c1..bea3134ffcc69bfbf997fb1f4d06314357605ecd 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -35,8 +35,8 @@ APARAPI Documentation
| [UsingMultiDimExecutionRanges](UsingMultiDimExecutionRanges.md) | How to use the new Range class (for multi-dim range access) |
| AccessingMultiDimNDRangeProposal | A proposal for accessing multi-dim ND range execution |
| LocalMemoryAndBarrierProposal | A proposal for handling local memory and barriers |
-| AddressSpacesUsingBuffers | Proposal For OpenCL address space support using java Buffers instead of arrays. |
-| BuildingNBody | How to build the NBody example.|
+| [AddressSpacesUsingBuffers](AddressSpacesUsingBuffers.md) | Proposal For OpenCL address space support using java Buffers instead of arrays. |
+| [BuildingNBody](BuildingNBody.md) | How to build the NBody example.|
| [UnitTestGuide](UnitTestGuide.md) | Unit test Guide Find out how to run Junit tests and how to add new tests. |
| NewFeatures | New Features added to this open source release of Aparapi. |
| UsersGuide | Aparapi User's Guide. |