diff --git a/README.md b/README.md
index edbcde2..5b5cb1a 100644
--- a/README.md
+++ b/README.md
@@ -4,26 +4,37 @@
OpenGrid an open-source, interactive map platform that allows users to explore multiple data sources in an easy-to-use interface. Developed to support situational awareness, incident monitoring and responses, historical data retrieval, and real-time advanced analytics. Users can perform advanced queries to filter data, search within custom boundaries, or based on the users location. Other GIS data, such as weather and Shapefiles can be overlaid on the map with other data. OpenGrid is natively compatible with desktops and mobile devices.
+OpenGrid uses a service layer to retrieve data from an underlying data store.
+
## Important Links
-* User Documentation: http://opengrid.readthedocs.io
-* Repository: https://github.com/Chicago/opengrid
+
+* User Documentation: http://docs.opengrid.io
+* Repository for User Interface: https://github.com/Chicago/opengrid
+* Repository for
* Planning Documentation and Meeting Notes: https://github.com/Chicago/opengrid/wiki
* Issues: https://github.com/Chicago/opengrid/issues
* Mailing List & Discussion: https://groups.google.com/forum/#!forum/opengrid-chicago
-## System Requirements
+## System Requirements
+
Web server for deployment and Open Grid Service Package.
-**Required Software**
+### Required Software
* Java Script IDE
* Node.js
* Npm
-**Browser Requirements:**
+### Browser Requirements:
OpenGrid has been tested on IE 10+, Chrome, Firefox, and Safari on the desktop. It has also been tested on iOS using Safari and Android using the Chrome browser.
+### Architecture
+
+This repository contains the code which users interact with in the web browser. OpenGrid depends on a service layer, which then communicates with a data storage layer. Currently, OpenGrid is compatible with [MongoDB](http://mongodb.com) or [Plenario](http://plenar.io) using their respective service layers.
+
+Read the documentation for a description of the service layer and available test instances.
+
## Installation
Download OpenGrid Code:
diff --git a/docs/Architecture.md b/docs/Architecture.md
new file mode 100644
index 0000000..8f46065
--- /dev/null
+++ b/docs/Architecture.md
@@ -0,0 +1,31 @@
+# Application Architecture
+
+OpenGrid consists of a user interface layer that is seen by the user in the web browser and a service layer. The service layer is responsible for interpreting commands from the user interface to an underlying data layer. In turn, the user interface communicates with the service layer through an [Application Programmer Interface (API)](http://docs.opengrid.io/en/latest/OpenGrid%20API/).
+
+![App Architecture](media/application-architecture-diagram.png)
+
+The service layer share the same API to communicate with the user interface, but are compatible with different data store engines. This approach will make it easier to maintain a consistent user interface, but allow it to be compatible with different databases and APIs as these tend to change or different data storage engines often change over time.
+
+OpenGrid is compatible with [MongoDB](https://www.mongodb.com) or [Plenario](http://www.plenar.io). MongoDB's service layer was created by the City of Chicago and [available in this repository](https://www.github.com/Chicago/opengrid-svc-template). The service layer for Plenario was created by Smart Chicago Collaborative and [available here](https://github.com/smartchicago/opengrid-svc-plenario).
+
+## MongoDB or Plenario?
+
+MongoDB is a flexible, JSON-based data engine that lets you easily store data with minimal concerns about designing a schema. Plenario is a storage engine which quickly and easily stores open data from [Socrata](https://www.socrata.com), such as [City of Chicago](https://data.cityofchicago.org), or CKAN like the [U.S. government](http://catalog.data.gov/dataset) data portals. Plenario makes all of these data available through a simple API.
+
+MongoDB is a great solution for on-site deployments or when using data not readily available on Socrata or CKAN. It is an open-source, supurbly documented database that can be installed on-site and behind a firewall. The City of Chicago, for instance, uses OpenGrid + MongoDB to power an internal version of OpenGrid, dubbed [WindyGrid](http://datasmart.ash.harvard.edu/news/article/chicagos-windygrid-taking-situational-awareness-to-a-new-level-259), that loads data from internal systems.
+
+Plenario quickly ingests data from popular open data portal platforms, Socrata and CKAN. But it is more difficult to upload data from other sources, such as databases. Therefore, pairing OpenGrid with Plenario (with the corresponding service layer) works great to visualize open data. Adding data from an open data portal is simple, see [Plenario's documentation for adding a data set](http://plenar.io/add). An example of OpenGrid + Plenario can be seen at [https://chicago.opengrid.io](https://chicago.opengrid.io).
+
+## Plenar.io test service layer
+
+A publicly-available instance of the Plenar.io service layer is at [http://opengrid-service-dev-1134290206.us-west-2.elb.amazonaws.com/opengrid-service/](http://opengrid-service-dev-1134290206.us-west-2.elb.amazonaws.com/opengrid-service/)
+
+Use this end-point to test any changes you have made to the OpenGrid application that relies on Plenario, but does not require the setup of the service layer.
+
+## Links
+
+* [OpenGrid user interface repo](https://github.com/Chicago/opengrid)
+* [OpenGrid Serivce layer API](OpenGrid%20API/)
+* [MongoDB-compatible service layer repo](https://github.com/Chicago/opengrid-svc-layer)
+* [Plenario service layer repo](https://github.com/smartchicago/opengrid-svc-plenario)
+* [Plenario serice layer development end-point](http://opengrid-service-dev-1134290206.us-west-2.elb.amazonaws.com/opengrid-service/)
\ No newline at end of file
diff --git a/docs/OpenGrid API.md b/docs/OpenGrid API.md
index 7203a82..4cc50a4 100644
--- a/docs/OpenGrid API.md
+++ b/docs/OpenGrid API.md
@@ -94,10 +94,11 @@ The JavaScript Web Token expire after 4 hours. The authentication token needs to
No response is returned but the authentication token, with key X-AUTH-TOKEN, is appended to the response header such as below:
-
-X-AUTH-TOKEN:
-eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTQzOTMzNjQwNywianRpIjoiYWRtaW4iLCJyb2xlcyI6Im9wZW5ncmlkX2FkbWlucyIsImZuYW1lIjoiT3BlbkdyaWQiLCJsbmFtZSI6IkFkbWluIn0.nShqceUs52ykIxu0RBRp4vZ8zaQqfdZ2haZn8AWMqyq5GJHRQkddoOaaLtKABktr32C0zha1pMJJBrjuYoPHIQ
-
+X-AUTH-TOKEN: This token can be parsed using the jwt_decode JavaScript Web Token library (See https://github.com/auth0/jwt-decode) @@ -796,17 +797,17 @@ It is recommended that this value be URL encoded.