Update docs -- we got rid of the uneccessary built artifacts.
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/build/amp.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/build/amp.mediawiki
index ad9e981..cc79abf 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/build/amp.mediawiki
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/build/amp.mediawiki
@@ -3,6 +3,46 @@
 In this manual we provide an in-depth understanding of what goes into an Agent Model, how you can use the Agent Modeling Framework and related tools to design one and present tutorials to get you started. But before going into details, let's take a quick overview at what agent-based modeling is is and how the Agent Modeling Framework can help you to develop models for ABM or other problem domains.
 
 We hope you enjoy using the tool, and we look forward to your comments and feedback and most of all participation!
+==Quick Start==
+
+If you're the kind of person who likes to jump right in, here are the basics.
+
+===Install===
+
+If you're using a complete IDE, or have already installed AMP from the Eclipse update sites, you can ignore this step. Otherwise, refer to the Installation Guide at the end of this manual.
+
+===Welcome!===
+
+When you first run the tools, you will see a welcome screen. If the screen isn't showing, select the '''Help > Welcome''' menu. Click on the "Overview", "Samples" or "Tutorials" buttons to begin your exploration.
+
+===Cheat!===
+
+The Agent Modeling tools come with a number of "Cheat Sheets" to help get you started. You can access them by selecting '''Help > Cheat Sheets...'''. Then under the "Agent Modeling" category, select a cheat sheet, such as "Load Sample Projects".
+
+===Follow the Tutorial===
+
+The tools also come with extensive tutorials. See the "Tutorials" section for more help on that.
+
+===Follow your Interest===
+
+AMP has many potential facets and use cases. Check out the following sections of the manual for more information about..
+
+====ABM Researchers====
+
+Run an example model using the "Run an Example Model" cheat sheet.
+
+====ABM Modelers====
+
+Create Agent-Based models using simple visual tools and deploy them to a number of popular ABM platforms, including Escape. Follow the tutorial section of the Modeler's guide.
+
+====ABM Java Developers====
+
+Write "Plain Old Java" models within a full-featured agent-based modeling framework. Read Programmers Guide and then try the "Create an Escape Java Model" cheat sheet.
+
+====Eclipse Plugin Developers====
+
+AXF and AGF provide a number of features based around Eclipse technologies such as GEF, GEF3D, BIRT Charts and Zest. For example, AGF supports dynamic visualization of objects in space, and AXF supports managed UI and headless execution for models of any kind. There isn't currently any general documentation for these features, but we encourage you to look at the APIs and at Escape's implementation of them. They're straightforward and can be useful for a variety of general science platform needs.
+
 ==Agent-Based Modeling==
 
 The primary focus of the Agent Modeling Platform tools is "Agent-Based Modeling" (ABM). ABM is an innovative technique used to explore complex phenomenon in many domains, including economics, social sciences, biomedicine, ecology and business operations. ABMs share characteristics with object models, but are:
@@ -24,22 +64,15 @@
 
 Agent-Based Models (ABMs) seek to represent important real-world dynamics by designing communities of software agents that mimic real entities. Rather than make simplifying assumptions about such systems and then representing them in equation form or as off the shelf algorithmic constructs, the ABM researcher aims to identify key agent state, interaction spaces, and behaviors. Agents are then "let loose" on our computers and we explore what happens next. The computational horsepower exists today to simulate large numbers (e.g. >>10) of interacting, adaptive and autonomous agents but often desktop computers are all we need to explore significant domains. ABMs have been designed to represent all kinds of important natural systems, at scales reaching from cellular mechanics to international trade and are being used to solve truly hard problems in government, business, and academia. ABMs are not a solution to every problem, but they can help us to appreciate and gain unique insight into many systems, and often they can help us to come up with better practical decisions than we might using classic approaches.
 
-==Other Uses==
+==Other Domains==
 
 Many kinds of objects share characteristics of ABM agents -- after all, software agents are used in many other contexts. The Agent Modeling Framework meta-modeling support is potentially suitable (or extendible) for a number of approaches outside of ABM; for example business rules, object interactions, systems dynamics models and traditional discrete event models. Similarly, AMP execution and graphic support can be used for modeling natural systems but could also be used to manage other software agents -- for example independent reasoning tasks or dynamic visualization support.
-==Credits==
 
-Miles Parker is a consultant and software developer with over ten years of experience in the agent-based modeling field and twenty years developing object-oriented tools and frameworks and is the architect and project lead for the Eclipse Agent Modeling Platform (Incubation).
-
-Metascape, LLC is the primary contributor to AMP and provides Agent-Based Modeling tools, including sophisticated tools based on the AMF platform, and comprehensive consulting services. For more information on Metascape products and services visit http://metascapeabm.com.
-
-The AMF meta-model started life as [[http://www.agent2005.anl.gov/2006procpdf/Parker_Agent_2006.pdf|"score"]], a component of the Repast Simphony environment. Argonne National Labs supported the initial development in 2007 and agreed to contribute the relevant IP to the Eclipse project in 2009. It wasn't fully utilized within Simphony, and migrated from there to the MetaABM project supported by Metascape. The MetaABM project defined a complete editor, code-generation and model execution suite that formed the initial AMP AMF contribution. Metascape has sponsored the development of AMF from 2007 through the present.
-
-The AMP logo was inspired by the [[http://swarm.org Swarm logo]] with their kind permission.
 ==The Agent Modeling Platform (AMP)==
 
-The Eclipse Agent Modeling Project (Incubation) or "AMP" provides extensible frameworks and exemplary tools for representing, editing, generating,
-executing and visualizing agent-based models (ABMs) and any other domain requiring spatial, behavioral and functional features. AMP has two main themes that complement but don't depend on one another, modeling of agent systems (AMF) and execution and exploration of those systems (AXF, AGF and Escape).
+The Eclipse Agent Modeling Project (Incubation) or "AMP" provides the core support for both open source and commercial modeling tools. AMP in turn is built upon Elipse, the most powerful, well-supported and popular Integrated Development Platform (IDE) available anywhere.
+
+AMP provides extensible frameworks and exemplary tools for representing, editing, generating, executing and visualizing ABMs and any other domain requiring spatial, behavioral and functional features. AMP has two main themes that complement but don't depend on one another, modeling of agent systems (AMF) and execution and exploration of those systems (AXF, AGF and Escape).
 
 The overall AMP architecture and project dependencies are summarized in the architectural diagram below:
 
@@ -59,39 +92,15 @@
 ===Escape===
 
 Escape is an exemplar ABM toolset. It's based on Ascape, which has been in use for more than 10 years. The core API is very stable, and that should give users a way to explore the features of AMP without concerns about keeping in synch with the rapidly evolving AXF /AGF API. It allows modelers to code in Java and/or generate models with AMF and then execute those models within the same development environment. Escape is the primary target for most of the models in this guide. Those users interested in writing code directly to the Escape API can refer to the Programmer Guide.
+==Credits==
 
-==Getting Started==
+Miles Parker is a consultant and software developer with over ten years of experience in the agent-based modeling field and twenty years developing object-oriented tools and frameworks and is the architect and project lead for the Eclipse Agent Modeling Platform (Incubation).
 
-AMP has many potential facets and use cases.
+Metascape, LLC is the primary contributor to AMP and provides Agent-Based Modeling tools, including sophisticated tools based on the AMF platform, and comprehensive consulting services. For more information on Metascape products and services visit http://metascapeabm.com.
 
-===Setting up Eclipse===
+The AMF meta-model started life as [[http://www.agent2005.anl.gov/2006procpdf/Parker_Agent_2006.pdf|"score"]], a component of the Repast Simphony environment. Argonne National Labs supported the initial development in 2007 and agreed to contribute the relevant IP to the Eclipse project in 2009. It wasn't fully utilized within Simphony, and migrated from there to the MetaABM project supported by Metascape. The MetaABM project defined a complete editor, code-generation and model execution suite that formed the initial AMP AMF contribution. Metascape has sponsored the development of AMF from 2007 through the present.
 
-If you're reading this from the Eclipse help browser, you've already done this! Otherwise, if you aren't using a full download version of AMP, you'll need to [http://eclipse.org/amp/installing/ install it]. Once you've done that, select the '''Help > Help Contents''' menu, find the Agent Modeling Guide and open this overview page within that guide.
-
-Some installations will also include a Welcome screen which will guide you through the same set of steps.
-
-===Get the Example Projects===
-
-You can do that using a cheat sheet. Select '''Help > Cheat Sheets...''' and then under the "Agent Modeling" category, select "Load Sample Projects".
-
-Then check out the following sections of the manual for more information about..
-
-===ABM Researchers===
-
-Run an example model using the "Run an Example Model" cheat sheet.
-
-===ABM Modelers===
-
-Create Agent-Based models using simple visual tools and deploy them to a number of popular ABM platforms, including Escape. Follow the tutorial section of the Modeler's guide.
-
-===ABM Java Developers===
-
-Write "Plain Old Java" models within a full-featured agent-based modeling framework. Read Programmers Guide and then try the "Create an Escape Java Model" cheat sheet.
-
-===Eclipse Plugin Developers===
-
-AXF and AGF provide a number of features based around Eclipse technologies such as GEF, GEF3D, BIRT Charts and Zest. For example, AGF supports dynamic visualization of objects in space, and AXF supports managed UI and headless execution for models of any kind. There isn't currently any general documentation for these features, but we encourage you to look at the APIs and at Escape's implementation of them. They're straightforward and can be useful for a variety of general science platform needs.
-
+The AMP logo was inspired by the [[http://swarm.org Swarm logo]] with their kind permission.
 =Modeler Guide=
 
 ==Overview==
@@ -183,19 +192,14 @@
 
 These can be anyone of the following: 
 
-{| cellpadding=="10" cellspacing=="0" border=="1"
-|Boolean
-|A value that is simply true or false. Note that unless this value really is a simple binary value, you should consider using state instead. (See details below.) For example, rather than representing gender as a 'Female' boolean value, define a 'Gender' state with values 'Male' and "Female'. Generated artifacts and documentation will be much clearer, and you'll be able to easily modify the model later if for example you discover that there are more than two potential gender categories that are relevant to your model.
-|-
-|Integer
-|A discrete whole number value, such as "100", "-1", "10029920". It's generally a good idea to represent any value that can never have a decimal value as an integer.
-|-
-|Real
-|A continuous number value. While these are typically represented in software as floating point numbers, they can conceivably represent numbers at any arbitrary precision and in any scheme. Note that while technically speaking we should be representing irrational numbers, this is not currently supported for default values and users should simply use the closest decimal approximation.
-|-
-|Symbol
-|A string representing some state. More precisely, a computationally arbitrary value with contextual meaning. This could be any kind of identifier. For example, you might use it to store some kind of input coding from data that is then converted into an object state. Or it could simply be an agent's name. But theoretically (though this is not currently supported) one could imagine a symbol using an idiogram, an icon or even a sound that identifies or represents the agent in question.
-|}
+;'''Boolean'''
+: A value that is simply true or false. Note that unless this value really is a simple binary value, you should consider using state instead. (See details below.) For example, rather than representing gender as a 'Female' boolean value, define a 'Gender' state with values 'Male' and "Female'. Generated artifacts and documentation will be much clearer, and you'll be able to easily modify the model later if for example you discover that there are more than two potential gender categories that are relevant to your model.
+;'''Integer'''
+: A discrete whole number value, such as "100", "-1", "10029920". It's generally a good idea to represent any value that can never have a decimal value as an integer.
+;'''Real'''
+:A continuous number value. While these are typically represented in software as floating point numbers, they can conceivably represent numbers at any arbitrary precision and in any scheme. Note that while technically speaking we should be representing irrational numbers, this is not currently supported for default values and users should simply use the closest decimal approximation.
+;'''Symbol'''
+:A string representing some state. More precisely, a computationally arbitrary value with contextual meaning. This could be any kind of identifier. For example, you might use it to store some kind of input coding from data that is then converted into an object state. Or it could simply be an agent's name. But theoretically (though this is not currently supported) one could imagine a symbol using an idiogram, an icon or even a sound that identifies or represents the agent in question.
 
 (Undefined and Numeric types should not be used within a well-defined model.)
 
@@ -250,9 +254,9 @@
 
 A value representing what happens to an agent when that agent is asked to move beyond its extent.
 
-;Periodic
+;'''Periodic'''
 : When encountering an edge, the agent will treat the space as wrapping around to the other side of the space. For example, if the agent at location {1,2} (0-based) within a Moore space (see grid discussion below) of size {10,10} is asked to find some other agent within distance 3, the agent look in the square defined between {8,9} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge. You can imagine this as taking a piece of graph paper and connecting the opposite edges. You can't actually do that with paper, but if you could you would have a toroidal (donut) shape in three dimensions defining the shape in two.
-;APeriodic
+;'''APeriodic'''
 : When encountering an edge, the agent treats it as the edge of the space. For example, if the agent at location {1,2} is asked to find some other agent within distance 3, the agent look between {0,0} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge.
 
 The "Strict" and "Bouncy" values are obsolete and should not be used.
@@ -275,11 +279,11 @@
 
 This value determines what constitutes a region within a particular distance from the agent. The value for this is often critical in obtaining particular behavior from a model, and shouldn't be overlooked. There are three possible values:
 
-;Euclidean
+;'''Euclidean'''
 : The distance between any two cells is taken to be the "real" distance. For example, if an agent was within a chess board, and we wanted to find all agents within distance three of it, we could determine that by taking a string of length 3, tacking it to the center of the source square, and including all cells whose centers we can reach with the other string end. Note that although Euclidean space may seem the most reasonable neighborhood configuration to choose, this really isn't the case. Euclidean space is continuous whereas grid space is discrete, and mapping the two to each other can create unexpected issues. Still, this is a good choice for models representing notional real spaces.
-;Moore
+;'''Moore'''
 :Here, the distance between any two cells is defined by the number of edge ''or'' corner adjacent cells crossed to get between them. To continue the chess board analogy, this is the set of moves that a king can make. Note that this does not map well to real space at all, as a cell at distance 1 in a moore space is at distance sqrt(2) in "real" space.
-;Von-Neumann
+;'''Von-Neumann'''
 : Here, the distance between any two cells is defined by the number of edge adjacent cells crossed to get between them. This is the set of moves that a rook might make on a chess board -- if a rook could only move one square at a time. It is also often referred to as a Manhattan distance for the self-evident reason.
  
 =====Network=====
@@ -1944,38 +1948,109 @@
 
 A primary purpose of the Escape project -- apart from the obvious goal of providing a nice Eclipse hosted ABM toolkit -- is to provide an exemplar to demonstrate how any arbitrary agent modeling framework can be integrated within the AMP environment. A cool aspect of this is that AMP has no dependencies on Escape, but also that the underlying ABM modeling framework for Escape has no dependencies on AMP -- instead Escape simply provides the runtime glue between AMP and the ABM framework. The underlying ABM framework uses the Ascape API, an API that first began development more than ten years ago and that has not been modified at all in order for it to work within the AMP environment.
 
-==Getting Started==
+==Documentation==
 
-===Documentation and other Resources===
+In addition to this documentation, there are a number of other resources available related to Escape development. Because it's API is based on Ascape, a lot of resources developed for Ascape are equally applicable to Ascape. The Ascape documentation is bundled with some distributions of the AMP tools, but if you are using the Eclipse AMP download, you can access it online or install it from the Ascape update site.
 
-Because it's API is based on Ascape, Escape is one component of AMP that already has extensive documentation. There is complete Javadoc as well as a manual and other web resources. See the [http://ascape.sourceforge.net Ascape Website] to locate these resources. There is a [http://ascape.sourceforge.net/docs/TheAscapeManual5.pdf full manual] for Ascape available on that site. Or, you can install the Ascape Manual into the eclipse help system by adding the following update site and selecting the "Documentations and Source Code" feature.
+===Online===
 
-http://ascape.sourceforge.net/eclipse
+There is a complete [http://ascape.sourceforge.net/api/index.html Javadoc] as well as an [http://ascape.sourceforge.net/docs/TheAscapeManual5.pdf excellent manual] and other web resources. See the [http://ascape.sourceforge.net Ascape Website] for general information.
 
-===Installation===
+===Update Site===
 
-Escape is [http://eclipse.org/amp/installing/ installed] by default with the other model components. If you want to do 3D (really 2 1/2) visualizations, you will want AGF3D and the LWJGL dependency. You can build from source but in that case you'l need to launch a self-hosted runtime, so it's best to simply install from the update site if you're not actually doing AMP development.
+Or, you can install the Ascape Manual into the eclipse help system by adding the following update site and selecting the "Documentations and Source Code" feature. See the Installation Guide for more information.
+
+ http://ascape.sourceforge.net/eclipse
+
+==Installation==
+
+See the Installation Guide for Detailed Information -- that all applies to general Escape usage as well.
+
+Note that there are no dependendencies on AMF, and therefore EMF or any other modeling technologies to do Java development for Escape or for running generated models within Escape. The deployment environment can be quite light-weight. Simply install the AXF, AGF, and AMP Escape features. You can build from source but in that case you'l need to launch a self-hosted runtime, so it's best to simply install from the update site if you're not actually doing AMP development.
+
+Escape is [http://eclipse.org/amp/installing/ installed] by default with the other model components. If you want to do 3D (really 2 1/2) visualizations, you will want AGF3D and the LWJGL dependency.
+
+==Example Java Models==
+
+===Exploring Example ABM Models===
+
+The first thing most people will want to do in AMP is to play with the example models. You can explore AMF models as well as some really interesting classic ABM models.
+
+====Installing Models====
+
+See the Installation Guide to find out how to get the example models.
+
+=====AMF Models=====
+
+All AMF models produce pure Java code so they can be used like any other Escape Java model.
+
+ org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape
+
+To understand the capabilities of AMF in producing other kinds of Java models, you might also want to try out running the same models automatically generated for Ascape or Repast. These are located at dev.eclipse.org in cvsroot/modeling:
+
+ org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape
+ org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast
+
+=====Classic Escape / Ascape Java Models=====
+
+Many models have been created using Ascape over the years, including all of the classic models created at Brookings and some other cool models such as Craig Reynold's Boids and a pretty cool little traffic model, and they've all been converted to run in Escape. They're in Java but you can execute and explore them in exactly the same way as the Epidemic model above. All of the Ascape example models have been converted (a straightforward process) from their intial Ascape incarnations. For licensing reasons (they're BSD, not EPL) we can't host them directly on the Eclipse site.  You can get the projects in two ways:
+
+Once you've downloaded the projects, open up the src folder and navigate to the Java files for the actual models. For example, to run Conway's Life, you'll want src/edu.brook.life.ConwayLife. Right-click on the Java file and select "Execute". There are many models to explore! (It's not always obvious which Java files are for models, so you may have to poke around a bit. We need to put together a catalog here. Another nice opportunity for user contributions.)
+ 
+These are SVN projects in the sourceforge SVN. For help, see [[http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php this page]].
+
+ http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.brook
+ http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.examples
+ 
+====Generating Models====
+
+And of course, you can always use the AMF tools to generate models and then customize them from there. See the following section on integrating AMF with Java for more on that. There are a number of models developed with AMF that can automatically generate example models to run in Escape. There are two ways to run the example models:
+
+=====Creating a New Escape Project=====
+
+The best option is to simply create a new Escape project and drag the models into it!
+
+#If you're not already there, open the Agent Modeling Perspective. Select Window > Open Perspective > Other.. and then Agent Modeling. (Or you can choose Window > Reset Perspective and the Agent Modeling perspective should appear in the Open Perspective list itself.)
+#Create the project where we'll place our model. Select File > New > Escape AMF Project. Give it a name like "escape.tutorial", then click Finish.
+#Finally grab the Epidemic.metaabm model at http://download.eclipse.org/amp/models/Epidemic.metaabm and drag it into the project. (Depending on your browser the file may load as text directly into your browser, in which case just right-click on the link and save it to a file.)
 
 ==Developing Models==
 
 The easiest way for Java developers to get started doing agent-based modeling in Eclipse is to begin to write programs using it. To develop new models, you can:
 
+===Cheatsheet===
+
+By far the simplest way to get started is with the cheatsheet. This walks you through the complete process of creating a Java based model. '''Help > Cheat Sheets...''' and then select "Create an Escape Java Model" from within the "Agent Modeling" category.
+
+===Steps===
+
 # Create a new Escape project. The Escape projects are actually configured for AMF code generation so there are dependencies and builders in there that you don't need; you can remove all of the escape builders and any of the kitchen sink items. The "Create an Escape Java Model" cheat sheet will walk you through the process of creating a new Java based project and model.
-# Or for more experienced Eclipse users, you can simply to just create a new Plugin Project and add the necessary dependencies there. Have a look at the example escape project to see what you need. Note that you will likely need more dependencies then you need to simply build -- this is because the class loader uses the classes from the project path and so runtime classes have to be there as well. We may simply package an Eclipse runtime convenience plugin to gather these dependencies up a bit.
+# Or for more experienced Eclipse users, you can simply to just create a new Plug-in Project and add the necessary dependencies there. Have a look at the example escape project to see what you need. Note that you will likely need more dependencies then you need to simply build -- this is because the class loader uses the classes from the project path and so runtime classes have to be there as well. We may simply package an Eclipse runtime convenience plug-in to gather these dependencies up a bit. Then just create new Java classes for your root model scape and agents just as you would for an Ascape project.
 
-Then just create new Java classes for your root model scape and agents just as you would for an Ascape project.
+==Executing Models==
 
-==More Information==
+See the User Guide Execution Section for information on launching and controling models.
 
-===Integrating Java and AMF Models===
+We have a complete cheat sheet supporting this tutorial. Simply go to '''Help > Cheat Sheets...''' and then select "Run an Example Model" from within the "Agent Modeling" category.
+
+===Tutorial===
+
+We've developer have a complete cheat sheet supporting this tutorial. Simply go to '''Help > Cheat Sheets...''' and then select "Run an Example Model" from within the "Agent Modeling" category.
+
+==Extending and Customizing AMP==
+
+This subject is beyond the scope of this Agent Modeling manual. A future Agent Modeling Platform Guide will discuss these issues in detail. For now, please keep an eye on the Wiki and committer blogs. And of course please ask questions on the AMP forum and developer mailing list. Letting us know you're interested in doing something is the best way to get it documented!
+
+
+==Integrating Java and AMF Models==
 
 If you're like many Java developers, you might find point-and-click interfaces a bit lame. Personally, I've changed my tune in this, and I now define all of my ABM models from the editor, saving Java for truly specialized tasks. But even without generation of agent behavior, Acore can be a really valuable tool, as the GIS example shows. The way to look at metaABM is as a way to compose your overall model and automate the tedious parts. Apart from Java generated code, the AMF meta-model maintains a number of very useful artifacts. For example, the Repast Simphony target maintains model.score and all of the model.rs component. Generally, AMF should save time and hassle while making your models far more transparent even if you never use the Actions component to define agent behavior.
 
-====Method Action====
+===Method Action===
 
 As explained in the action section, you can simply create a "Method" act with hand-written Java code. This option is nice because all code is contained within the AMF file. But it can be difficult to maintain large blocks of Java code as you aren't using a Java editor to edit the Java code itself. One way to get around this is to create your code in the generated Java method and then copy it into the Method action. Note one imporant issue here -- you'll generally have to fully qualify your Java references as you won't be able to change the imports statements directly. 
 
-====Protected Code Regions====
+===Protected Code Regions===
 
 You can mix and match Action behavior with Java and generated code with POJOs. One way to do this is through using protected regions. Select the agent you want to create protected methods for and then select "Generate Protected" from the "Mode" property. Now, create actions just as you have before, or use your existing ones. On code generation, open up the relevant java file and examine the methods that have been created. 
 
@@ -1985,25 +2060,25 @@
 
 [[Image:images/pojo/ProgrammingPojoGenerateCode.png]]
 
-====Implement Sub-classes====
+===Interface and Base Class Generation===
 
 Another approach which can be more robust is to generate the basic model stubs (like an abstract base class except that it isn't abstract) and then override your model with implementations. AMF provides support for generic skeletons and interfaces.
 
 [[Image:images/pojo/ProgrammingPojoGenerate.png]]
 
-===Converting Existing Ascape models===
+==Converting Existing Ascape Models==
 
 There are only a few changes should have to make to existing Ascape models or to use existing Ascape documentation to develop Escape models.
 
-====Model====
+===Model===
 
 The core model is completely API compatible. No changes!
 
-====View====
+===View===
 
 Because Escape uses SWT and Ascape uses Swing, there are a few unavoidable incompatibilities. Most of these we avoid by using higher level APIs but here are the key changes that you're likely to have to make:
 
-=====Convert the low-level imports from AWT and Swing to SWT=====
+====Convert the low-level imports from AWT and Swing to SWT====
 The simplest way to accomplish this is to remove all of the imports and then organize imports. For example:
  java.awt.Color => org.eclipse.swt.graphics.Color
  java.awt.Graphics => org.eclipse.draw2d.Graphics
@@ -2012,18 +2087,18 @@
  replace: [nothing]
 You don't have to replace these with the SWT equivalents, just click on the project, right-click and choose "Source:Organize Imports.."
 By the way, a great way to avoid having to select the right entries in optimize imports and to alert you when you have missed anything is to prevent the awt and swing classes from being used at all. Right-click on project, choose "Build Path:Configure Build Path", go to Libraries tab, open JRE System Library, choose "Access Rules", edit, and then add entries for java/awt/** and javax/swing/**. The code will regenerate and you'll have error markers for all of the stuff that won't work with Escape and Eclipse.
-=====Convert color features=====
+====Convert color features====
 You can't use AWT colors either so you'll need to replace any colors. AMP provides a convenience classes for Colors called ColorFeature and ColorFeatureConcrete. You can use these or any of the other ways to define SWT colors. For example:
  Color.lightGray => ColorFeature.LIGHT_GRAY
  new Color(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy) => 
      ColorFeatureConcrete.create(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy)
-=====Change agent color getters=====
+====Change agent color getters====
 If you've defined colors through overriding Agents as in most models, you'll need to change the method signature. You could just do a global replace for this one.
  public Color getColor( => public Object getPlatformColor(
-=====Get rid of image features=====
+====Get rid of image features====
 Escape doesn't support them. In practice they haven't been used a lot. At some point perhaps we'll have nice sprite support instead. :)
  public Image getImage() {**} => ""
-=====Modify usages of DrawFeatures=====
+====Modify usages of DrawFeatures====
 If you've created any of your own draw features, you'll need to change them slightly to accommodate the differences between the AWT and SWT / Draw2D APIs. This should be pretty straightforwrd. For example:
  g.setColor(...
  g.fillOval(..
@@ -2036,77 +2111,115 @@
 ====Configuration====
 
 Instead of using Ant, Escape has really nice support for parameterizing and testing models. See [[Experimenting and Testing]] (todo). If you do want to work with ant you will need to install the plugins from the Sourceforge download site. (These have dependencies that I didn't want to bother with going through the Eclipse IP process to get in. If for some reason you think these should be part of core Escape let Miles know and I'll take care of it.) Ant has not been tested for Escape so it's not even clear it will work.
-==Running Agent Models==
+=Installation Guide=
 
+==Tools==
 
-===Exploring Example ABM Models===
+===Complete IDE===
 
-The first thing most people will want to do in AMP is to play with the example models. You can explore AMF models as well as some really interesting classic ABM models.
+You may already have obtained a complete IDE bundled with AMP and other modeling tools. The project contributors offer open source and commercial versions of the AMP tools, which you can find at their sites. If so, you can mostly ignore this chapter unless you want to install an optional component like Repast.
 
-====Downloading Models====
+===Eclipse and the Agent Modeling Tools===
 
-To obtain the models, simply launch the cheat sheet. Go to the '''Help > Cheat Sheets...''' menu and choose "Load Sample Projects".
+You can find more detailed instructions [http://eclipse.org/amp/installing/ here], but here are the basic steps.
 
-Or you can get them yourself from the following locations:
+#Install the latest version of Eclipse from [http://www.eclipse.org/downloads/ here]. AMP requires version 3.5.x (Gallieo) or higher. Version 3.6 (Hellos) which is currently a development (beta) release works well too. We recommend the "Classic" release at the bottom of the page as the other releases have a bunch of stuff you wont' need.
+#Add update sites for AMP and AMP dependencies. See the screenshot below and the [http://help.eclipse.org/galileo/topic/org.eclipse.platform.doc.user/tasks/tasks-124.htm Eclipse Documentation]. There are different versions of the update sites, depending on whether you want to use the most stable version of the toolset or the "latest and greatest". The update sites are listed below.
+#(Optional) If you install and AMP extensions, add Update Sites for them -- they're also listed below.
+#Select the features that you want to install.
+#Click the '''Next''' button, review the licenses, and then click '''Finish'''.
 
-=====AMF Models=====
+Agent Modeling Platform update sites:
+ Milestones (recommended): http://download.eclipse.org/amp/updates/milestones
+ Interim (newer): http://download.eclipse.org/amp/updates/interim
+ Nightly (bleeding edge): http://download.eclipse.org/amp/updates/nightly
 
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape
+Update sites for AMP Extensions
+ AGF 3D (recommended): http://lwjgl.org/update
+ AMF for Ascape (recommended for Java developers): http://ascape.sourceforge.net/eclipse
+ AMF for Repast (for people using Repast): http://mirror.anl.gov/pub/repastsimphony/site.xml (non P2)
 
-To understand the capabilities of AMF, you might also want to try out running the same models automatically generated for Ascape or Repast. These are located at dev.eclipse.org in cvsroot/modeling:
+In the following screenshot, we've added the LWJGL site (not shown) as well as the Ascape site (not shown), but not the Repast site, and we're about to install the respective features. 
 
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast
+[[Image:images/resources/AMPUpdateSite.png]]
 
-=====Escape / Ascape Java Models=====
+Once you've done that, select the '''Help > Help Contents''' menu, find the Agent Modeling Guide and open this overview page within that guide.
 
-These are SVN projects in the sourceforge SVN. For help, see [[http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php this page]].
+===Extensions===
 
- http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.brook
- http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.examples
+====Ascape====
+
+For licensing and copyright reasons we can't provide all of the Ascape tools and manual on the Eclipse hosted Agent Modeling Project site. None of these tools are necessary to use AMP (the core Ascape support is an IP approved part of the AMP distribution) but they're highly recommended. The Ascape tools include:
+
+#An excellent Manual covering programming Java models in Ascape and Escape. (The API is the same.)
+#Support for creating Ascape Java projects and executing the Swing-based Java Applications. Swing deployed Ascape Java Applications can be as small as 10MB and can be deployed to the web.
+#Eclipse based IDE support for plain Java Ascape projects.
+
+The Ascape update site is at:
+
+ http://ascape.sourceforge.net/eclipse
  
-====Generating Models====
+To install Ascape, use the update manager. Select '''Help > Install New Software..."''', add the Ascape update site, select the Ascape category and click the '''Finish''' button.
 
-There are a number of models developed with AMF that can automatically generate example models to run in Escape. There are two ways to run the example models:
+[[Image:images/resources/AscapeUpdateSite.png]]
 
-=====Creating a New Escape Project=====
+====Repast====
 
-The best option is to simply create a new Escape project and drag the models into it!
+The Repast update site is at:
 
-#If you're not already there, open the Agent Modeling Perspective. Select Window > Open Perspective > Other.. and then Agent Modeling. (Or you can choose Window > Reset Perspective and the Agent Modeling perspective should appear in the Open Perspective list itself.)
-#Next, let's create the project where we'll place our model. Select File > New > Escape AMF Project. Give it a name like "escape.tutorial", then click Finish.
-#Finally grab the Epidemic.metaabm model at http://download.eclipse.org/amp/models/Epidemic.metaabm and drag it into the project. (Depending on your browser the file may load as text directly into your browser, in which case just right-click on the link and save it to a file.)
+ http://mirror.anl.gov/pub/repastsimphony/site.xml
 
-===Tutorial===
+More information on downloading and installing repast can be found [http://repast.sourceforge.net/docs/development.html here]. Follow the instrucitons for "Configuration B".
 
-We've developer have a complete cheat sheet supporting this tutorial. Simply go to '''Help > Cheat Sheets...''' and then select "Run an Example Model" from within the "Agent Modeling" category.
+==Models==
 
-
-====Next Steps====
-
-To understand the capabilities of AMF, you might also want to try out running the same models automatically generated for Ascape or Repast.
-
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast
-
-===Classic Java ABM Models===
-
-Many models have been created using Ascape over the years, including all of the classic models created at Brookings and some other cool models such as Craig Reynold's Boids and a pretty cool little traffic model, and they've all been converted to run in Escape. They're in Java but you can execute and explore them in exactly the same way as the Epidemic model above. All of the Ascape example models have been converted (a straightforward process) from their intial Ascape incarnations. For licensing reasons (they're BSD, not EPL) we can't host them directly on the Eclipse site.  You can get the projects in two ways:
-
-Once you've downloaded the projects, open up the src folder and navigate to the Java files for the actual models. For example, to run Conway's Life, you'll want src/edu.brook.life.ConwayLife. Right-click on the Java file and select "Execute". There are many models to explore! (It's not always obvious which Java files are for models, so you may have to poke around a bit. We need to put together a catalog here. Another nice opportunity for user contributions.)
-=Resources=
-
-==Obtaining Example Models==
+===Obtaining Example Models===
 
 There is a cheat-sheet available for obtaining the example models. If you would rather obtain them yourself, here is the CVS information:
 
-====Import from CVS====
-*Import the CVS projects from the AMP project repository. For help, see [http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/reference/ref-40a.htm this page]. For repository details, see [http://eclipse.org/amp/developers/repositoryDetails.php http://eclipse.org/amp/developers/repositoryDetails.php]. These are the example projects:
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape 
+====Team Project Sets====
+
+You can use the following team project sets. See [http://help.eclipse.org/galileo/topic/org.eclipse.platform.doc.user/tasks/tasks-cvs-project-set.htm this document] for more information about using project sets.
+
+ http://eclipse.org/amp/project-sets/ascape.psf
+ http://eclipse.org/amp/project-sets/escapeAMFExamples.psf
+
+====From Version Control Systems====
+
+Import the CVS projects from the AMP project repository. For help, see [http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/reference/ref-40a.htm this page]. Here are the details for CVS Access:
+
+CVS Repository:
+
+ Connection type:	pserver
+ User:	anonymous
+ Password:	[none]
+ Host:	dev.eclipse.org
+ Path:	/cvsroot/modeling
+ Module:	/org.eclipse.amp
+
+AMF Escape Models:
+
  org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape 
+
+AMF Ascape and Repast Models:
+
+ org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape 
  org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast 
-*Right-click on the models to execute them.
-*Play around with the model attribute settings and behavior (Acts).
+
+The Ascape example projects are available at the Sourceforge SVN server. You can get them at the following locations. See the [[http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php Subversive User Guide]] for more information about using SVN. (You'll need to install Subversion if you don't already have it.)
+
+Escape Java Models:
+
+ https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.models.brook
+ https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.models.examples
+
+Ascape (Swing-based) Java Models:
+
+
+ https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.examples
+ https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.brook
+ 
+=Resources=
 
 ==Websites==
 
@@ -2127,10 +2240,9 @@
 ==Issues==
 
 Eclipse and the AMP project have a mandate for open communication. Please note that unless you are a customer of an AMP project contributor we will not respond to direct requests for support. We ''will'' make every effort to support your use of AMP in the following ways:
-
 ===General Support, Questions and Discussion===
 
-The [http://www.eclipse.org/forums/index.php?t=thread&frm_id=17&S=f4fa6cb31327772a3b626dc409db409b Agent Modeling Platform Newsgroup] is the place to discuss or get support for any of the Eclipse AMP tools. 
+The [http://www.eclipse.org/forums/index.php?t=thread&frm_id=17&S=f4fa6cb31327772a3b626dc409db409b Agent Modeling Platform Newsgroup] is the place to discuss or get support for any of the Eclipse AMP tools. Don't hesitate to ask questions about model implementation or bring up more general topics for discussion.
 
 ===View Existing Bugs and Feature Requests===
 
@@ -2147,6 +2259,7 @@
 ===Discuss AMP Development and Project===
 
 All discussion about software development, design and project management issues take place on the AMP dev-list. If you're interested in contributing to the AMP project, this is a good place to contact us. [https://dev.eclipse.org/mailman/listinfo/amp-dev].
+==Other Contacts==
 
 ===Professional Support===
 
@@ -2156,12 +2269,6 @@
 
 For project related but non-public communications such as media enquires or potential project sponsorship, please contact Miles Parker, the Eclipse AMP project lead, at amp_enquiry@metascapeabm.com. (Requests for support and other communications to this address will be ignored.)
 
-==Feedback==
-
-If you have ideas, comments or requests for information about the project please contact us at the .
-
 ==Get Involved==
 
 If you find this tool valuable, please be aware that most of its development occurred through volunteer contributions from individuals and companies that have received no direct funding. You can support continual development efforts financially by purchasing related software tools from companies and organizations that help develop it, including funding for developer time in grant proposals. You can support the Eclipse platform in general by becoming a member organization of Eclipse. But the most important thing that you can contribute is your own time and enthusiasm, either through directly contributing to AMP or by promoting its use in blogs and other social media. For more detailed information about contributing to AMP, please see [http://wiki.eclipse.org/AMP/Getting_Involved our wiki].
-
- 
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/build/amp.xml b/org.eclipse.amp/doc/org.eclipse.amp.doc/build/amp.xml
index d122283..d5f0b28 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/build/amp.xml
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/build/amp.xml
@@ -5,6 +5,50 @@
 		<title>Introduction</title>
 		<para>In this manual we provide an in-depth understanding of what goes into an Agent Model, how you can use the Agent Modeling Framework and related tools to design one and present tutorials to get you started. But before going into details, let's take a quick overview at what agent-based modeling is is and how the Agent Modeling Framework can help you to develop models for ABM or other problem domains.</para>
 		<para>We hope you enjoy using the tool, and we look forward to your comments and feedback and most of all participation!</para>
+		<section id="Quick_Start">
+			<title>Quick Start</title>
+			<para>If you're the kind of person who likes to jump right in, here are the basics.</para>
+			<section id="Install">
+				<title>Install</title>
+				<para>If you're using a complete IDE, or have already installed AMP from the Eclipse update sites, you can ignore this step. Otherwise, refer to the Installation Guide at the end of this manual.</para>
+			</section>
+			<section id="Welcome.21">
+				<title>Welcome!</title>
+				<para>When you first run the tools, you will see a welcome screen. If the screen isn't showing, select the 
+					<emphasis role="bold">Help &gt; Welcome</emphasis> menu. Click on the "Overview", "Samples" or "Tutorials" buttons to begin your exploration.
+				</para>
+			</section>
+			<section id="Cheat.21">
+				<title>Cheat!</title>
+				<para>The Agent Modeling tools come with a number of "Cheat Sheets" to help get you started. You can access them by selecting 
+					<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis>. Then under the "Agent Modeling" category, select a cheat sheet, such as "Load Sample Projects".
+				</para>
+			</section>
+			<section id="Follow_the_Tutorial">
+				<title>Follow the Tutorial</title>
+				<para>The tools also come with extensive tutorials. See the "Tutorials" section for more help on that.</para>
+			</section>
+			<section id="Follow_your_Interest">
+				<title>Follow your Interest</title>
+				<para>AMP has many potential facets and use cases. Check out the following sections of the manual for more information about..</para>
+				<section id="ABM_Researchers">
+					<title>ABM Researchers</title>
+					<para>Run an example model using the "Run an Example Model" cheat sheet.</para>
+				</section>
+				<section id="ABM_Modelers">
+					<title>ABM Modelers</title>
+					<para>Create Agent-Based models using simple visual tools and deploy them to a number of popular ABM platforms, including Escape. Follow the tutorial section of the Modeler's guide.</para>
+				</section>
+				<section id="ABM_Java_Developers">
+					<title>ABM Java Developers</title>
+					<para>Write "Plain Old Java" models within a full-featured agent-based modeling framework. Read Programmers Guide and then try the "Create an Escape Java Model" cheat sheet.</para>
+				</section>
+				<section id="Eclipse_Plugin_Developers">
+					<title>Eclipse Plugin Developers</title>
+					<para>AXF and AGF provide a number of features based around Eclipse technologies such as GEF, GEF3D, BIRT Charts and Zest. For example, AGF supports dynamic visualization of objects in space, and AXF supports managed UI and headless execution for models of any kind. There isn't currently any general documentation for these features, but we encourage you to look at the APIs and at Escape's implementation of them. They're straightforward and can be useful for a variety of general science platform needs.</para>
+				</section>
+			</section>
+		</section>
 		<section id="Agent-Based_Modeling">
 			<title>Agent-Based Modeling</title>
 			<para>The primary focus of the Agent Modeling Platform tools is "Agent-Based Modeling" (ABM). ABM is an innovative technique used to explore complex phenomenon in many domains, including economics, social sciences, biomedicine, ecology and business operations. ABMs share characteristics with object models, but are:</para>
@@ -49,27 +93,14 @@
 			<para>Existing scientific models are very good at representing relatively simple systems, but generally speaking aren't very good at representing complex systems. The world is full of complex systems, and our misunderstanding of these systems has prevented us from addressing many of the key challenges facing the world, including the global financial crisis and climate change -- in fact once could argue that our misunderstanding of these systems has strongly contributed to these crises.</para>
 			<para>Agent-Based Models (ABMs) seek to represent important real-world dynamics by designing communities of software agents that mimic real entities. Rather than make simplifying assumptions about such systems and then representing them in equation form or as off the shelf algorithmic constructs, the ABM researcher aims to identify key agent state, interaction spaces, and behaviors. Agents are then "let loose" on our computers and we explore what happens next. The computational horsepower exists today to simulate large numbers (e.g. &gt;&gt;10) of interacting, adaptive and autonomous agents but often desktop computers are all we need to explore significant domains. ABMs have been designed to represent all kinds of important natural systems, at scales reaching from cellular mechanics to international trade and are being used to solve truly hard problems in government, business, and academia. ABMs are not a solution to every problem, but they can help us to appreciate and gain unique insight into many systems, and often they can help us to come up with better practical decisions than we might using classic approaches.</para>
 		</section>
-		<section id="Other_Uses">
-			<title>Other Uses</title>
+		<section id="Other_Domains">
+			<title>Other Domains</title>
 			<para>Many kinds of objects share characteristics of ABM agents -- after all, software agents are used in many other contexts. The Agent Modeling Framework meta-modeling support is potentially suitable (or extendible) for a number of approaches outside of ABM; for example business rules, object interactions, systems dynamics models and traditional discrete event models. Similarly, AMP execution and graphic support can be used for modeling natural systems but could also be used to manage other software agents -- for example independent reasoning tasks or dynamic visualization support.</para>
 		</section>
-		<section id="Credits">
-			<title>Credits</title>
-			<para>Miles Parker is a consultant and software developer with over ten years of experience in the agent-based modeling field and twenty years developing object-oriented tools and frameworks and is the architect and project lead for the Eclipse Agent Modeling Platform (Incubation).</para>
-			<para>Metascape, LLC is the primary contributor to AMP and provides Agent-Based Modeling tools, including sophisticated tools based on the AMF platform, and comprehensive consulting services. For more information on Metascape products and services visit 
-				<ulink url="http://metascapeabm.com">http://metascapeabm.com</ulink>.
-			</para>
-			<para>The AMF meta-model started life as 
-				<ulink url="/wiki/http://www.agent2005.anl.gov/2006procpdf/Parker_Agent_2006.pdf">"score"</ulink>, a component of the Repast Simphony environment. Argonne National Labs supported the initial development in 2007 and agreed to contribute the relevant IP to the Eclipse project in 2009. It wasn't fully utilized within Simphony, and migrated from there to the MetaABM project supported by Metascape. The MetaABM project defined a complete editor, code-generation and model execution suite that formed the initial AMP AMF contribution. Metascape has sponsored the development of AMF from 2007 through the present.
-			</para>
-			<para>The AMP logo was inspired by the 
-				<ulink url="/wiki/http://swarm.org_Swarm_logo">http://swarm.org Swarm logo</ulink> with their kind permission.
-			</para>
-		</section>
 		<section id="The_Agent_Modeling_Platform_.28AMP.29">
 			<title>The Agent Modeling Platform (AMP)</title>
-			<para>The Eclipse Agent Modeling Project (Incubation) or "AMP" provides extensible frameworks and exemplary tools for representing, editing, generating,
-				executing and visualizing agent-based models (ABMs) and any other domain requiring spatial, behavioral and functional features. AMP has two main themes that complement but don't depend on one another, modeling of agent systems (AMF) and execution and exploration of those systems (AXF, AGF and Escape).</para>
+			<para>The Eclipse Agent Modeling Project (Incubation) or "AMP" provides the core support for both open source and commercial modeling tools. AMP in turn is built upon Elipse, the most powerful, well-supported and popular Integrated Development Platform (IDE) available anywhere.</para>
+			<para>AMP provides extensible frameworks and exemplary tools for representing, editing, generating, executing and visualizing ABMs and any other domain requiring spatial, behavioral and functional features. AMP has two main themes that complement but don't depend on one another, modeling of agent systems (AMF) and execution and exploration of those systems (AXF, AGF and Escape).</para>
 			<para>The overall AMP architecture and project dependencies are summarized in the architectural diagram below:</para>
 			<para>
 				<mediaobject>
@@ -95,40 +126,18 @@
 				<para>Escape is an exemplar ABM toolset. It's based on Ascape, which has been in use for more than 10 years. The core API is very stable, and that should give users a way to explore the features of AMP without concerns about keeping in synch with the rapidly evolving AXF /AGF API. It allows modelers to code in Java and/or generate models with AMF and then execute those models within the same development environment. Escape is the primary target for most of the models in this guide. Those users interested in writing code directly to the Escape API can refer to the Programmer Guide.</para>
 			</section>
 		</section>
-		<section id="Getting_Started">
-			<title>Getting Started</title>
-			<para>AMP has many potential facets and use cases.</para>
-			<section id="Setting_up_Eclipse">
-				<title>Setting up Eclipse</title>
-				<para>If you're reading this from the Eclipse help browser, you've already done this! Otherwise, if you aren't using a full download version of AMP, you'll need to 
-					<ulink url="http://eclipse.org/amp/installing/">install it</ulink>. Once you've done that, select the 
-					<emphasis role="bold">Help &gt; Help Contents</emphasis> menu, find the Agent Modeling Guide and open this overview page within that guide.
-				</para>
-				<para>Some installations will also include a Welcome screen which will guide you through the same set of steps.</para>
-			</section>
-			<section id="Get_the_Example_Projects">
-				<title>Get the Example Projects</title>
-				<para>You can do that using a cheat sheet. Select 
-					<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis> and then under the "Agent Modeling" category, select "Load Sample Projects".
-				</para>
-				<para>Then check out the following sections of the manual for more information about..</para>
-			</section>
-			<section id="ABM_Researchers">
-				<title>ABM Researchers</title>
-				<para>Run an example model using the "Run an Example Model" cheat sheet.</para>
-			</section>
-			<section id="ABM_Modelers">
-				<title>ABM Modelers</title>
-				<para>Create Agent-Based models using simple visual tools and deploy them to a number of popular ABM platforms, including Escape. Follow the tutorial section of the Modeler's guide.</para>
-			</section>
-			<section id="ABM_Java_Developers">
-				<title>ABM Java Developers</title>
-				<para>Write "Plain Old Java" models within a full-featured agent-based modeling framework. Read Programmers Guide and then try the "Create an Escape Java Model" cheat sheet.</para>
-			</section>
-			<section id="Eclipse_Plugin_Developers">
-				<title>Eclipse Plugin Developers</title>
-				<para>AXF and AGF provide a number of features based around Eclipse technologies such as GEF, GEF3D, BIRT Charts and Zest. For example, AGF supports dynamic visualization of objects in space, and AXF supports managed UI and headless execution for models of any kind. There isn't currently any general documentation for these features, but we encourage you to look at the APIs and at Escape's implementation of them. They're straightforward and can be useful for a variety of general science platform needs.</para>
-			</section>
+		<section id="Credits">
+			<title>Credits</title>
+			<para>Miles Parker is a consultant and software developer with over ten years of experience in the agent-based modeling field and twenty years developing object-oriented tools and frameworks and is the architect and project lead for the Eclipse Agent Modeling Platform (Incubation).</para>
+			<para>Metascape, LLC is the primary contributor to AMP and provides Agent-Based Modeling tools, including sophisticated tools based on the AMF platform, and comprehensive consulting services. For more information on Metascape products and services visit 
+				<ulink url="http://metascapeabm.com">http://metascapeabm.com</ulink>.
+			</para>
+			<para>The AMF meta-model started life as 
+				<ulink url="/wiki/http://www.agent2005.anl.gov/2006procpdf/Parker_Agent_2006.pdf">"score"</ulink>, a component of the Repast Simphony environment. Argonne National Labs supported the initial development in 2007 and agreed to contribute the relevant IP to the Eclipse project in 2009. It wasn't fully utilized within Simphony, and migrated from there to the MetaABM project supported by Metascape. The MetaABM project defined a complete editor, code-generation and model execution suite that formed the initial AMP AMF contribution. Metascape has sponsored the development of AMF from 2007 through the present.
+			</para>
+			<para>The AMP logo was inspired by the 
+				<ulink url="/wiki/http://swarm.org_Swarm_logo">http://swarm.org Swarm logo</ulink> with their kind permission.
+			</para>
 		</section>
 	</chapter>
 	<chapter id="Modeler_Guide">
@@ -221,24 +230,40 @@
 						<section id="Type">
 							<title>Type</title>
 							<para>These can be anyone of the following: </para>
-							<informaltable>
-								<tr>
-									<td>Boolean</td>
-									<td>A value that is simply true or false. Note that unless this value really is a simple binary value, you should consider using state instead. (See details below.) For example, rather than representing gender as a 'Female' boolean value, define a 'Gender' state with values 'Male' and "Female'. Generated artifacts and documentation will be much clearer, and you'll be able to easily modify the model later if for example you discover that there are more than two potential gender categories that are relevant to your model.</td>
-								</tr>
-								<tr>
-									<td>Integer</td>
-									<td>A discrete whole number value, such as "100", "-1", "10029920". It's generally a good idea to represent any value that can never have a decimal value as an integer.</td>
-								</tr>
-								<tr>
-									<td>Real</td>
-									<td>A continuous number value. While these are typically represented in software as floating point numbers, they can conceivably represent numbers at any arbitrary precision and in any scheme. Note that while technically speaking we should be representing irrational numbers, this is not currently supported for default values and users should simply use the closest decimal approximation.</td>
-								</tr>
-								<tr>
-									<td>Symbol</td>
-									<td>A string representing some state. More precisely, a computationally arbitrary value with contextual meaning. This could be any kind of identifier. For example, you might use it to store some kind of input coding from data that is then converted into an object state. Or it could simply be an agent's name. But theoretically (though this is not currently supported) one could imagine a symbol using an idiogram, an icon or even a sound that identifies or represents the agent in question.</td>
-								</tr>
-							</informaltable>
+							<variablelist>
+								<varlistentry>
+									<term>
+										<emphasis role="bold">Boolean</emphasis>
+									</term>
+									<listitem>
+										<para>A value that is simply true or false. Note that unless this value really is a simple binary value, you should consider using state instead. (See details below.) For example, rather than representing gender as a 'Female' boolean value, define a 'Gender' state with values 'Male' and "Female'. Generated artifacts and documentation will be much clearer, and you'll be able to easily modify the model later if for example you discover that there are more than two potential gender categories that are relevant to your model.</para>
+									</listitem>
+								</varlistentry>
+								<varlistentry>
+									<term>
+										<emphasis role="bold">Integer</emphasis>
+									</term>
+									<listitem>
+										<para>A discrete whole number value, such as "100", "-1", "10029920". It's generally a good idea to represent any value that can never have a decimal value as an integer.</para>
+									</listitem>
+								</varlistentry>
+								<varlistentry>
+									<term>
+										<emphasis role="bold">Real</emphasis>
+									</term>
+									<listitem>
+										<para>A continuous number value. While these are typically represented in software as floating point numbers, they can conceivably represent numbers at any arbitrary precision and in any scheme. Note that while technically speaking we should be representing irrational numbers, this is not currently supported for default values and users should simply use the closest decimal approximation.</para>
+									</listitem>
+								</varlistentry>
+								<varlistentry>
+									<term>
+										<emphasis role="bold">Symbol</emphasis>
+									</term>
+									<listitem>
+										<para>A string representing some state. More precisely, a computationally arbitrary value with contextual meaning. This could be any kind of identifier. For example, you might use it to store some kind of input coding from data that is then converted into an object state. Or it could simply be an agent's name. But theoretically (though this is not currently supported) one could imagine a symbol using an idiogram, an icon or even a sound that identifies or represents the agent in question.</para>
+									</listitem>
+								</varlistentry>
+							</variablelist>
 							<para>(Undefined and Numeric types should not be used within a well-defined model.)</para>
 						</section>
 						<section id="Default_Value">
@@ -290,13 +315,17 @@
 							<para>A value representing what happens to an agent when that agent is asked to move beyond its extent.</para>
 							<variablelist>
 								<varlistentry>
-									<term>Periodic</term>
+									<term>
+										<emphasis role="bold">Periodic</emphasis>
+									</term>
 									<listitem>
 										<para>When encountering an edge, the agent will treat the space as wrapping around to the other side of the space. For example, if the agent at location {1,2} (0-based) within a Moore space (see grid discussion below) of size {10,10} is asked to find some other agent within distance 3, the agent look in the square defined between {8,9} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge. You can imagine this as taking a piece of graph paper and connecting the opposite edges. You can't actually do that with paper, but if you could you would have a toroidal (donut) shape in three dimensions defining the shape in two.</para>
 									</listitem>
 								</varlistentry>
 								<varlistentry>
-									<term>APeriodic</term>
+									<term>
+										<emphasis role="bold">APeriodic</emphasis>
+									</term>
 									<listitem>
 										<para>When encountering an edge, the agent treats it as the edge of the space. For example, if the agent at location {1,2} is asked to find some other agent within distance 3, the agent look between {0,0} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge.</para>
 									</listitem>
@@ -322,13 +351,17 @@
 							<para>This value determines what constitutes a region within a particular distance from the agent. The value for this is often critical in obtaining particular behavior from a model, and shouldn't be overlooked. There are three possible values:</para>
 							<variablelist>
 								<varlistentry>
-									<term>Euclidean</term>
+									<term>
+										<emphasis role="bold">Euclidean</emphasis>
+									</term>
 									<listitem>
 										<para>The distance between any two cells is taken to be the "real" distance. For example, if an agent was within a chess board, and we wanted to find all agents within distance three of it, we could determine that by taking a string of length 3, tacking it to the center of the source square, and including all cells whose centers we can reach with the other string end. Note that although Euclidean space may seem the most reasonable neighborhood configuration to choose, this really isn't the case. Euclidean space is continuous whereas grid space is discrete, and mapping the two to each other can create unexpected issues. Still, this is a good choice for models representing notional real spaces.</para>
 									</listitem>
 								</varlistentry>
 								<varlistentry>
-									<term>Moore</term>
+									<term>
+										<emphasis role="bold">Moore</emphasis>
+									</term>
 									<listitem>
 										<para>Here, the distance between any two cells is defined by the number of edge 
 											<emphasis role="italic">or</emphasis> corner adjacent cells crossed to get between them. To continue the chess board analogy, this is the set of moves that a king can make. Note that this does not map well to real space at all, as a cell at distance 1 in a moore space is at distance sqrt(2) in "real" space.
@@ -336,7 +369,9 @@
 									</listitem>
 								</varlistentry>
 								<varlistentry>
-									<term>Von-Neumann</term>
+									<term>
+										<emphasis role="bold">Von-Neumann</emphasis>
+									</term>
 									<listitem>
 										<para>Here, the distance between any two cells is defined by the number of edge adjacent cells crossed to get between them. This is the set of moves that a rook might make on a chess board -- if a rook could only move one square at a time. It is also often referred to as a Manhattan distance for the self-evident reason.</para>
 									</listitem>
@@ -3048,163 +3083,54 @@
 			</para>
 			<para>A primary purpose of the Escape project -- apart from the obvious goal of providing a nice Eclipse hosted ABM toolkit -- is to provide an exemplar to demonstrate how any arbitrary agent modeling framework can be integrated within the AMP environment. A cool aspect of this is that AMP has no dependencies on Escape, but also that the underlying ABM modeling framework for Escape has no dependencies on AMP -- instead Escape simply provides the runtime glue between AMP and the ABM framework. The underlying ABM framework uses the Ascape API, an API that first began development more than ten years ago and that has not been modified at all in order for it to work within the AMP environment.</para>
 		</section>
-		<section id="Getting_Started_2">
-			<title>Getting Started</title>
-			<section id="Documentation_and_other_Resources">
-				<title>Documentation and other Resources</title>
-				<para>Because it's API is based on Ascape, Escape is one component of AMP that already has extensive documentation. There is complete Javadoc as well as a manual and other web resources. See the 
-					<ulink url="http://ascape.sourceforge.net">Ascape Website</ulink> to locate these resources. There is a 
-					<ulink url="http://ascape.sourceforge.net/docs/TheAscapeManual5.pdf">full manual</ulink> for Ascape available on that site. Or, you can install the Ascape Manual into the eclipse help system by adding the following update site and selecting the "Documentations and Source Code" feature.
-				</para>
-				<para>
-					<ulink url="http://ascape.sourceforge.net/eclipse">http://ascape.sourceforge.net/eclipse</ulink>
+		<section id="Documentation">
+			<title>Documentation</title>
+			<para>In addition to this documentation, there are a number of other resources available related to Escape development. Because it's API is based on Ascape, a lot of resources developed for Ascape are equally applicable to Ascape. The Ascape documentation is bundled with some distributions of the AMP tools, but if you are using the Eclipse AMP download, you can access it online or install it from the Ascape update site.</para>
+			<section id="Online">
+				<title>Online</title>
+				<para>There is a complete 
+					<ulink url="http://ascape.sourceforge.net/api/index.html">Javadoc</ulink> as well as an 
+					<ulink url="http://ascape.sourceforge.net/docs/TheAscapeManual5.pdf">excellent manual</ulink> and other web resources. See the 
+					<ulink url="http://ascape.sourceforge.net">Ascape Website</ulink> for general information.
 				</para>
 			</section>
-			<section id="Installation">
-				<title>Installation</title>
-				<para>Escape is 
-					<ulink url="http://eclipse.org/amp/installing/">installed</ulink> by default with the other model components. If you want to do 3D (really 2 1/2) visualizations, you will want AGF3D and the LWJGL dependency. You can build from source but in that case you'l need to launch a self-hosted runtime, so it's best to simply install from the update site if you're not actually doing AMP development.
-				</para>
+			<section id="Update_Site">
+				<title>Update Site</title>
+				<para>Or, you can install the Ascape Manual into the eclipse help system by adding the following update site and selecting the "Documentations and Source Code" feature. See the Installation Guide for more information.</para>
+				<literallayout>http://ascape.sourceforge.net/eclipse
+</literallayout>
 			</section>
 		</section>
-		<section id="Developing_Models">
-			<title>Developing Models</title>
-			<para>The easiest way for Java developers to get started doing agent-based modeling in Eclipse is to begin to write programs using it. To develop new models, you can:</para>
-			<orderedlist>
-				<listitem>
-					<para>Create a new Escape project. The Escape projects are actually configured for AMF code generation so there are dependencies and builders in there that you don't need; you can remove all of the escape builders and any of the kitchen sink items. The "Create an Escape Java Model" cheat sheet will walk you through the process of creating a new Java based project and model.</para>
-				</listitem>
-				<listitem>
-					<para>Or for more experienced Eclipse users, you can simply to just create a new Plugin Project and add the necessary dependencies there. Have a look at the example escape project to see what you need. Note that you will likely need more dependencies then you need to simply build -- this is because the class loader uses the classes from the project path and so runtime classes have to be there as well. We may simply package an Eclipse runtime convenience plugin to gather these dependencies up a bit.</para>
-				</listitem>
-			</orderedlist>
-			<para>Then just create new Java classes for your root model scape and agents just as you would for an Ascape project.</para>
+		<section id="Installation">
+			<title>Installation</title>
+			<para>See the Installation Guide for Detailed Information -- that all applies to general Escape usage as well.</para>
+			<para>Note that there are no dependendencies on AMF, and therefore EMF or any other modeling technologies to do Java development for Escape or for running generated models within Escape. The deployment environment can be quite light-weight. Simply install the AXF, AGF, and AMP Escape features. You can build from source but in that case you'l need to launch a self-hosted runtime, so it's best to simply install from the update site if you're not actually doing AMP development.</para>
+			<para>Escape is 
+				<ulink url="http://eclipse.org/amp/installing/">installed</ulink> by default with the other model components. If you want to do 3D (really 2 1/2) visualizations, you will want AGF3D and the LWJGL dependency.
+			</para>
 		</section>
-		<section id="More_Information">
-			<title>More Information</title>
-			<section id="Integrating_Java_and_AMF_Models">
-				<title>Integrating Java and AMF Models</title>
-				<para>If you're like many Java developers, you might find point-and-click interfaces a bit lame. Personally, I've changed my tune in this, and I now define all of my ABM models from the editor, saving Java for truly specialized tasks. But even without generation of agent behavior, Acore can be a really valuable tool, as the GIS example shows. The way to look at metaABM is as a way to compose your overall model and automate the tedious parts. Apart from Java generated code, the AMF meta-model maintains a number of very useful artifacts. For example, the Repast Simphony target maintains model.score and all of the model.rs component. Generally, AMF should save time and hassle while making your models far more transparent even if you never use the Actions component to define agent behavior.</para>
-				<section id="Method_Action">
-					<title>Method Action</title>
-					<para>As explained in the action section, you can simply create a "Method" act with hand-written Java code. This option is nice because all code is contained within the AMF file. But it can be difficult to maintain large blocks of Java code as you aren't using a Java editor to edit the Java code itself. One way to get around this is to create your code in the generated Java method and then copy it into the Method action. Note one imporant issue here -- you'll generally have to fully qualify your Java references as you won't be able to change the imports statements directly. </para>
-				</section>
-				<section id="Protected_Code_Regions">
-					<title>Protected Code Regions</title>
-					<para>You can mix and match Action behavior with Java and generated code with POJOs. One way to do this is through using protected regions. Select the agent you want to create protected methods for and then select "Generate Protected" from the "Mode" property. Now, create actions just as you have before, or use your existing ones. On code generation, open up the relevant java file and examine the methods that have been created. </para>
-					<para>
-						<mediaobject>
-							<imageobject>
-								<imagedata fileref="images/pojo/ProgrammingPojoGenerateProps.png"/>
-							</imageobject>
-						</mediaobject>
-					</para>
-					<para>You can put whatever you want within the PROTECTED REGION comments and those changes will be preserved when the model is regenerated. You can create a schedule, rule or watcher, maintain custom code for the actual implementations, and still have the model adapt to changes in the underlying data structure -- if for example you want to import a modified shape file.</para>
-					<para>
-						<mediaobject>
-							<imageobject>
-								<imagedata fileref="images/pojo/ProgrammingPojoGenerateCode.png"/>
-							</imageobject>
-						</mediaobject>
-					</para>
-				</section>
-				<section id="Implement_Sub-classes">
-					<title>Implement Sub-classes</title>
-					<para>Another approach which can be more robust is to generate the basic model stubs (like an abstract base class except that it isn't abstract) and then override your model with implementations. AMF provides support for generic skeletons and interfaces.</para>
-					<para>
-						<mediaobject>
-							<imageobject>
-								<imagedata fileref="images/pojo/ProgrammingPojoGenerate.png"/>
-							</imageobject>
-						</mediaobject>
-					</para>
-				</section>
-			</section>
-			<section id="Converting_Existing_Ascape_models">
-				<title>Converting Existing Ascape models</title>
-				<para>There are only a few changes should have to make to existing Ascape models or to use existing Ascape documentation to develop Escape models.</para>
-				<section id="Model">
-					<title>Model</title>
-					<para>The core model is completely API compatible. No changes!</para>
-				</section>
-				<section id="View">
-					<title>View</title>
-					<para>Because Escape uses SWT and Ascape uses Swing, there are a few unavoidable incompatibilities. Most of these we avoid by using higher level APIs but here are the key changes that you're likely to have to make:</para>
-					<section id="Convert_the_low-level_imports_from_AWT_and_Swing_to_SWT">
-						<title>Convert the low-level imports from AWT and Swing to SWT</title>
-						<para>The simplest way to accomplish this is to remove all of the imports and then organize imports. For example:</para>
-						<literallayout>java.awt.Color =&gt; org.eclipse.swt.graphics.Color
-java.awt.Graphics =&gt; org.eclipse.draw2d.Graphics
-</literallayout>
-						<para>Then just do a global find for all of the imports and replace them with nothing. This is a great place for a regexp. Try:</para>
-						<literallayout>find: import java\.awt\.(.*);
-replace: [nothing]
-</literallayout>
-						<para>You don't have to replace these with the SWT equivalents, just click on the project, right-click and choose "Source:Organize Imports.."
-							By the way, a great way to avoid having to select the right entries in optimize imports and to alert you when you have missed anything is to prevent the awt and swing classes from being used at all. Right-click on project, choose "Build Path:Configure Build Path", go to Libraries tab, open JRE System Library, choose "Access Rules", edit, and then add entries for java/awt/** and javax/swing/**. The code will regenerate and you'll have error markers for all of the stuff that won't work with Escape and Eclipse.</para>
-					</section>
-					<section id="Convert_color_features">
-						<title>Convert color features</title>
-						<para>You can't use AWT colors either so you'll need to replace any colors. AMP provides a convenience classes for Colors called ColorFeature and ColorFeatureConcrete. You can use these or any of the other ways to define SWT colors. For example:</para>
-						<literallayout>Color.lightGray =&gt; ColorFeature.LIGHT_GRAY
-new Color(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy) =&gt; 
-    ColorFeatureConcrete.create(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy)
-</literallayout>
-					</section>
-					<section id="Change_agent_color_getters">
-						<title>Change agent color getters</title>
-						<para>If you've defined colors through overriding Agents as in most models, you'll need to change the method signature. You could just do a global replace for this one.</para>
-						<literallayout>public Color getColor( =&gt; public Object getPlatformColor(
-</literallayout>
-					</section>
-					<section id="Get_rid_of_image_features">
-						<title>Get rid of image features</title>
-						<para>Escape doesn't support them. In practice they haven't been used a lot. At some point perhaps we'll have nice sprite support instead. :)</para>
-						<literallayout>public Image getImage() {**} =&gt; ""
-</literallayout>
-					</section>
-					<section id="Modify_usages_of_DrawFeatures">
-						<title>Modify usages of DrawFeatures</title>
-						<para>If you've created any of your own draw features, you'll need to change them slightly to accommodate the differences between the AWT and SWT / Draw2D APIs. This should be pretty straightforwrd. For example:</para>
-						<literallayout>g.setColor(...
-g.fillOval(..
-becomes:
-g.setBackgroundColor(
-g.fillOval(..
-</literallayout>
-						<para>That's about it, though it's probable that we've missed something. Please post a message on the amp newsgroup if you run into any other conversion issues.</para>
-					</section>
-				</section>
-				<section id="Configuration">
-					<title>Configuration</title>
-					<para>Instead of using Ant, Escape has really nice support for parameterizing and testing models. See 
-						<ulink url="/wiki/Experimenting_and_Testing">Experimenting and Testing</ulink> (todo). If you do want to work with ant you will need to install the plugins from the Sourceforge download site. (These have dependencies that I didn't want to bother with going through the Eclipse IP process to get in. If for some reason you think these should be part of core Escape let Miles know and I'll take care of it.) Ant has not been tested for Escape so it's not even clear it will work.
-					</para>
-				</section>
-			</section>
-		</section>
-		<section id="Running_Agent_Models">
-			<title>Running Agent Models</title>
+		<section id="Example_Java_Models">
+			<title>Example Java Models</title>
 			<section id="Exploring_Example_ABM_Models">
 				<title>Exploring Example ABM Models</title>
 				<para>The first thing most people will want to do in AMP is to play with the example models. You can explore AMF models as well as some really interesting classic ABM models.</para>
-				<section id="Downloading_Models">
-					<title>Downloading Models</title>
-					<para>To obtain the models, simply launch the cheat sheet. Go to the 
-						<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis> menu and choose "Load Sample Projects".
-					</para>
-					<para>Or you can get them yourself from the following locations:</para>
+				<section id="Installing_Models">
+					<title>Installing Models</title>
+					<para>See the Installation Guide to find out how to get the example models.</para>
 					<section id="AMF_Models">
 						<title>AMF Models</title>
+						<para>All AMF models produce pure Java code so they can be used like any other Escape Java model.</para>
 						<literallayout>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape
 </literallayout>
-						<para>To understand the capabilities of AMF, you might also want to try out running the same models automatically generated for Ascape or Repast. These are located at dev.eclipse.org in cvsroot/modeling:</para>
+						<para>To understand the capabilities of AMF in producing other kinds of Java models, you might also want to try out running the same models automatically generated for Ascape or Repast. These are located at dev.eclipse.org in cvsroot/modeling:</para>
 						<literallayout>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape
 org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast
 </literallayout>
 					</section>
-					<section id="Escape_.2F_Ascape_Java_Models">
-						<title>Escape / Ascape Java Models</title>
+					<section id="Classic_Escape_.2F_Ascape_Java_Models">
+						<title>Classic Escape / Ascape Java Models</title>
+						<para>Many models have been created using Ascape over the years, including all of the classic models created at Brookings and some other cool models such as Craig Reynold's Boids and a pretty cool little traffic model, and they've all been converted to run in Escape. They're in Java but you can execute and explore them in exactly the same way as the Epidemic model above. All of the Ascape example models have been converted (a straightforward process) from their intial Ascape incarnations. For licensing reasons (they're BSD, not EPL) we can't host them directly on the Eclipse site.  You can get the projects in two ways:</para>
+						<para>Once you've downloaded the projects, open up the src folder and navigate to the Java files for the actual models. For example, to run Conway's Life, you'll want src/edu.brook.life.ConwayLife. Right-click on the Java file and select "Execute". There are many models to explore! (It's not always obvious which Java files are for models, so you may have to poke around a bit. We need to put together a catalog here. Another nice opportunity for user contributions.)</para>
 						<para>These are SVN projects in the sourceforge SVN. For help, see 
 							<ulink url="/wiki/http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php_this_page">http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php this page</ulink>.
 						</para>
@@ -3215,7 +3141,7 @@
 				</section>
 				<section id="Generating_Models">
 					<title>Generating Models</title>
-					<para>There are a number of models developed with AMF that can automatically generate example models to run in Escape. There are two ways to run the example models:</para>
+					<para>And of course, you can always use the AMF tools to generate models and then customize them from there. See the following section on integrating AMF with Java for more on that. There are a number of models developed with AMF that can automatically generate example models to run in Escape. There are two ways to run the example models:</para>
 					<section id="Creating_a_New_Escape_Project">
 						<title>Creating a New Escape Project</title>
 						<para>The best option is to simply create a new Escape project and drag the models into it!</para>
@@ -3224,7 +3150,7 @@
 								<para>If you're not already there, open the Agent Modeling Perspective. Select Window &gt; Open Perspective &gt; Other.. and then Agent Modeling. (Or you can choose Window &gt; Reset Perspective and the Agent Modeling perspective should appear in the Open Perspective list itself.)</para>
 							</listitem>
 							<listitem>
-								<para>Next, let's create the project where we'll place our model. Select File &gt; New &gt; Escape AMF Project. Give it a name like "escape.tutorial", then click Finish.</para>
+								<para>Create the project where we'll place our model. Select File &gt; New &gt; Escape AMF Project. Give it a name like "escape.tutorial", then click Finish.</para>
 							</listitem>
 							<listitem>
 								<para>Finally grab the Epidemic.metaabm model at 
@@ -3235,57 +3161,298 @@
 					</section>
 				</section>
 			</section>
+		</section>
+		<section id="Developing_Models">
+			<title>Developing Models</title>
+			<para>The easiest way for Java developers to get started doing agent-based modeling in Eclipse is to begin to write programs using it. To develop new models, you can:</para>
+			<section id="Cheatsheet">
+				<title>Cheatsheet</title>
+				<para>By far the simplest way to get started is with the cheatsheet. This walks you through the complete process of creating a Java based model. 
+					<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis> and then select "Create an Escape Java Model" from within the "Agent Modeling" category.
+				</para>
+			</section>
+			<section id="Steps">
+				<title>Steps</title>
+				<orderedlist>
+					<listitem>
+						<para>Create a new Escape project. The Escape projects are actually configured for AMF code generation so there are dependencies and builders in there that you don't need; you can remove all of the escape builders and any of the kitchen sink items. The "Create an Escape Java Model" cheat sheet will walk you through the process of creating a new Java based project and model.</para>
+					</listitem>
+					<listitem>
+						<para>Or for more experienced Eclipse users, you can simply to just create a new Plug-in Project and add the necessary dependencies there. Have a look at the example escape project to see what you need. Note that you will likely need more dependencies then you need to simply build -- this is because the class loader uses the classes from the project path and so runtime classes have to be there as well. We may simply package an Eclipse runtime convenience plug-in to gather these dependencies up a bit. Then just create new Java classes for your root model scape and agents just as you would for an Ascape project.</para>
+					</listitem>
+				</orderedlist>
+			</section>
+		</section>
+		<section id="Executing_Models">
+			<title>Executing Models</title>
+			<para>See the User Guide Execution Section for information on launching and controling models.</para>
+			<para>We have a complete cheat sheet supporting this tutorial. Simply go to 
+				<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis> and then select "Run an Example Model" from within the "Agent Modeling" category.
+			</para>
 			<section id="Tutorial">
 				<title>Tutorial</title>
 				<para>We've developer have a complete cheat sheet supporting this tutorial. Simply go to 
 					<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis> and then select "Run an Example Model" from within the "Agent Modeling" category.
 				</para>
-				<section id="Next_Steps">
-					<title>Next Steps</title>
-					<para>To understand the capabilities of AMF, you might also want to try out running the same models automatically generated for Ascape or Repast.</para>
-					<literallayout>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast
+			</section>
+		</section>
+		<section id="Extending_and_Customizing_AMP">
+			<title>Extending and Customizing AMP</title>
+			<para>This subject is beyond the scope of this Agent Modeling manual. A future Agent Modeling Platform Guide will discuss these issues in detail. For now, please keep an eye on the Wiki and committer blogs. And of course please ask questions on the AMP forum and developer mailing list. Letting us know you're interested in doing something is the best way to get it documented!</para>
+		</section>
+		<section id="Integrating_Java_and_AMF_Models">
+			<title>Integrating Java and AMF Models</title>
+			<para>If you're like many Java developers, you might find point-and-click interfaces a bit lame. Personally, I've changed my tune in this, and I now define all of my ABM models from the editor, saving Java for truly specialized tasks. But even without generation of agent behavior, Acore can be a really valuable tool, as the GIS example shows. The way to look at metaABM is as a way to compose your overall model and automate the tedious parts. Apart from Java generated code, the AMF meta-model maintains a number of very useful artifacts. For example, the Repast Simphony target maintains model.score and all of the model.rs component. Generally, AMF should save time and hassle while making your models far more transparent even if you never use the Actions component to define agent behavior.</para>
+			<section id="Method_Action">
+				<title>Method Action</title>
+				<para>As explained in the action section, you can simply create a "Method" act with hand-written Java code. This option is nice because all code is contained within the AMF file. But it can be difficult to maintain large blocks of Java code as you aren't using a Java editor to edit the Java code itself. One way to get around this is to create your code in the generated Java method and then copy it into the Method action. Note one imporant issue here -- you'll generally have to fully qualify your Java references as you won't be able to change the imports statements directly. </para>
+			</section>
+			<section id="Protected_Code_Regions">
+				<title>Protected Code Regions</title>
+				<para>You can mix and match Action behavior with Java and generated code with POJOs. One way to do this is through using protected regions. Select the agent you want to create protected methods for and then select "Generate Protected" from the "Mode" property. Now, create actions just as you have before, or use your existing ones. On code generation, open up the relevant java file and examine the methods that have been created. </para>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/pojo/ProgrammingPojoGenerateProps.png"/>
+						</imageobject>
+					</mediaobject>
+				</para>
+				<para>You can put whatever you want within the PROTECTED REGION comments and those changes will be preserved when the model is regenerated. You can create a schedule, rule or watcher, maintain custom code for the actual implementations, and still have the model adapt to changes in the underlying data structure -- if for example you want to import a modified shape file.</para>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/pojo/ProgrammingPojoGenerateCode.png"/>
+						</imageobject>
+					</mediaobject>
+				</para>
+			</section>
+			<section id="Interface_and_Base_Class_Generation">
+				<title>Interface and Base Class Generation</title>
+				<para>Another approach which can be more robust is to generate the basic model stubs (like an abstract base class except that it isn't abstract) and then override your model with implementations. AMF provides support for generic skeletons and interfaces.</para>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/pojo/ProgrammingPojoGenerate.png"/>
+						</imageobject>
+					</mediaobject>
+				</para>
+			</section>
+		</section>
+		<section id="Converting_Existing_Ascape_Models">
+			<title>Converting Existing Ascape Models</title>
+			<para>There are only a few changes should have to make to existing Ascape models or to use existing Ascape documentation to develop Escape models.</para>
+			<section id="Model">
+				<title>Model</title>
+				<para>The core model is completely API compatible. No changes!</para>
+			</section>
+			<section id="View">
+				<title>View</title>
+				<para>Because Escape uses SWT and Ascape uses Swing, there are a few unavoidable incompatibilities. Most of these we avoid by using higher level APIs but here are the key changes that you're likely to have to make:</para>
+				<section id="Convert_the_low-level_imports_from_AWT_and_Swing_to_SWT">
+					<title>Convert the low-level imports from AWT and Swing to SWT</title>
+					<para>The simplest way to accomplish this is to remove all of the imports and then organize imports. For example:</para>
+					<literallayout>java.awt.Color =&gt; org.eclipse.swt.graphics.Color
+java.awt.Graphics =&gt; org.eclipse.draw2d.Graphics
+</literallayout>
+					<para>Then just do a global find for all of the imports and replace them with nothing. This is a great place for a regexp. Try:</para>
+					<literallayout>find: import java\.awt\.(.*);
+replace: [nothing]
+</literallayout>
+					<para>You don't have to replace these with the SWT equivalents, just click on the project, right-click and choose "Source:Organize Imports.."
+						By the way, a great way to avoid having to select the right entries in optimize imports and to alert you when you have missed anything is to prevent the awt and swing classes from being used at all. Right-click on project, choose "Build Path:Configure Build Path", go to Libraries tab, open JRE System Library, choose "Access Rules", edit, and then add entries for java/awt/** and javax/swing/**. The code will regenerate and you'll have error markers for all of the stuff that won't work with Escape and Eclipse.</para>
+				</section>
+				<section id="Convert_color_features">
+					<title>Convert color features</title>
+					<para>You can't use AWT colors either so you'll need to replace any colors. AMP provides a convenience classes for Colors called ColorFeature and ColorFeatureConcrete. You can use these or any of the other ways to define SWT colors. For example:</para>
+					<literallayout>Color.lightGray =&gt; ColorFeature.LIGHT_GRAY
+new Color(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy) =&gt; 
+    ColorFeatureConcrete.create(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy)
 </literallayout>
 				</section>
+				<section id="Change_agent_color_getters">
+					<title>Change agent color getters</title>
+					<para>If you've defined colors through overriding Agents as in most models, you'll need to change the method signature. You could just do a global replace for this one.</para>
+					<literallayout>public Color getColor( =&gt; public Object getPlatformColor(
+</literallayout>
+				</section>
+				<section id="Get_rid_of_image_features">
+					<title>Get rid of image features</title>
+					<para>Escape doesn't support them. In practice they haven't been used a lot. At some point perhaps we'll have nice sprite support instead. :)</para>
+					<literallayout>public Image getImage() {**} =&gt; ""
+</literallayout>
+				</section>
+				<section id="Modify_usages_of_DrawFeatures">
+					<title>Modify usages of DrawFeatures</title>
+					<para>If you've created any of your own draw features, you'll need to change them slightly to accommodate the differences between the AWT and SWT / Draw2D APIs. This should be pretty straightforwrd. For example:</para>
+					<literallayout>g.setColor(...
+g.fillOval(..
+becomes:
+g.setBackgroundColor(
+g.fillOval(..
+</literallayout>
+					<para>That's about it, though it's probable that we've missed something. Please post a message on the amp newsgroup if you run into any other conversion issues.</para>
+				</section>
+				<section id="Configuration">
+					<title>Configuration</title>
+					<para>Instead of using Ant, Escape has really nice support for parameterizing and testing models. See 
+						<ulink url="/wiki/Experimenting_and_Testing">Experimenting and Testing</ulink> (todo). If you do want to work with ant you will need to install the plugins from the Sourceforge download site. (These have dependencies that I didn't want to bother with going through the Eclipse IP process to get in. If for some reason you think these should be part of core Escape let Miles know and I'll take care of it.) Ant has not been tested for Escape so it's not even clear it will work.
+					</para>
+				</section>
 			</section>
-			<section id="Classic_Java_ABM_Models">
-				<title>Classic Java ABM Models</title>
-				<para>Many models have been created using Ascape over the years, including all of the classic models created at Brookings and some other cool models such as Craig Reynold's Boids and a pretty cool little traffic model, and they've all been converted to run in Escape. They're in Java but you can execute and explore them in exactly the same way as the Epidemic model above. All of the Ascape example models have been converted (a straightforward process) from their intial Ascape incarnations. For licensing reasons (they're BSD, not EPL) we can't host them directly on the Eclipse site.  You can get the projects in two ways:</para>
-				<para>Once you've downloaded the projects, open up the src folder and navigate to the Java files for the actual models. For example, to run Conway's Life, you'll want src/edu.brook.life.ConwayLife. Right-click on the Java file and select "Execute". There are many models to explore! (It's not always obvious which Java files are for models, so you may have to poke around a bit. We need to put together a catalog here. Another nice opportunity for user contributions.)</para>
+		</section>
+	</chapter>
+	<chapter id="Installation_Guide">
+		<title>Installation Guide</title>
+		<section id="Tools">
+			<title>Tools</title>
+			<section id="Complete_IDE">
+				<title>Complete IDE</title>
+				<para>You may already have obtained a complete IDE bundled with AMP and other modeling tools. The project contributors offer open source and commercial versions of the AMP tools, which you can find at their sites. If so, you can mostly ignore this chapter unless you want to install an optional component like Repast.</para>
+			</section>
+			<section id="Eclipse_and_the_Agent_Modeling_Tools">
+				<title>Eclipse and the Agent Modeling Tools</title>
+				<para>You can find more detailed instructions 
+					<ulink url="http://eclipse.org/amp/installing/">here</ulink>, but here are the basic steps.
+				</para>
+				<orderedlist>
+					<listitem>
+						<para>Install the latest version of Eclipse from 
+							<ulink url="http://www.eclipse.org/downloads/">here</ulink>. AMP requires version 3.5.x (Gallieo) or higher. Version 3.6 (Hellos) which is currently a development (beta) release works well too. We recommend the "Classic" release at the bottom of the page as the other releases have a bunch of stuff you wont' need.
+						</para>
+					</listitem>
+					<listitem>
+						<para>Add update sites for AMP and AMP dependencies. See the screenshot below and the 
+							<ulink url="http://help.eclipse.org/galileo/topic/org.eclipse.platform.doc.user/tasks/tasks-124.htm">Eclipse Documentation</ulink>. There are different versions of the update sites, depending on whether you want to use the most stable version of the toolset or the "latest and greatest". The update sites are listed below.
+						</para>
+					</listitem>
+					<listitem>
+						<para>(Optional) If you install and AMP extensions, add Update Sites for them -- they're also listed below.</para>
+					</listitem>
+					<listitem>
+						<para>Select the features that you want to install.</para>
+					</listitem>
+					<listitem>
+						<para>Click the 
+							<emphasis role="bold">Next</emphasis> button, review the licenses, and then click 
+							<emphasis role="bold">Finish</emphasis>.
+						</para>
+					</listitem>
+				</orderedlist>
+				<para>Agent Modeling Platform update sites:</para>
+				<literallayout>Milestones (recommended): http://download.eclipse.org/amp/updates/milestones
+Interim (newer): http://download.eclipse.org/amp/updates/interim
+Nightly (bleeding edge): http://download.eclipse.org/amp/updates/nightly
+</literallayout>
+				<para>Update sites for AMP Extensions</para>
+				<literallayout>AGF 3D (recommended): http://lwjgl.org/update
+AMF for Ascape (recommended for Java developers): http://ascape.sourceforge.net/eclipse
+AMF for Repast (for people using Repast): http://mirror.anl.gov/pub/repastsimphony/site.xml (non P2)
+</literallayout>
+				<para>In the following screenshot, we've added the LWJGL site (not shown) as well as the Ascape site (not shown), but not the Repast site, and we're about to install the respective features. </para>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/resources/AMPUpdateSite.png"/>
+						</imageobject>
+					</mediaobject>
+				</para>
+				<para>Once you've done that, select the 
+					<emphasis role="bold">Help &gt; Help Contents</emphasis> menu, find the Agent Modeling Guide and open this overview page within that guide.
+				</para>
+			</section>
+			<section id="Extensions">
+				<title>Extensions</title>
+				<section id="Ascape">
+					<title>Ascape</title>
+					<para>For licensing and copyright reasons we can't provide all of the Ascape tools and manual on the Eclipse hosted Agent Modeling Project site. None of these tools are necessary to use AMP (the core Ascape support is an IP approved part of the AMP distribution) but they're highly recommended. The Ascape tools include:</para>
+					<orderedlist>
+						<listitem>
+							<para>An excellent Manual covering programming Java models in Ascape and Escape. (The API is the same.)</para>
+						</listitem>
+						<listitem>
+							<para>Support for creating Ascape Java projects and executing the Swing-based Java Applications. Swing deployed Ascape Java Applications can be as small as 10MB and can be deployed to the web.</para>
+						</listitem>
+						<listitem>
+							<para>Eclipse based IDE support for plain Java Ascape projects.</para>
+						</listitem>
+					</orderedlist>
+					<para>The Ascape update site is at:</para>
+					<literallayout>http://ascape.sourceforge.net/eclipse
+</literallayout>
+					<para>To install Ascape, use the update manager. Select 
+						<emphasis role="bold">Help &gt; Install New Software..."</emphasis>, add the Ascape update site, select the Ascape category and click the 
+						<emphasis role="bold">Finish</emphasis> button.
+					</para>
+					<para>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/resources/AscapeUpdateSite.png"/>
+							</imageobject>
+						</mediaobject>
+					</para>
+				</section>
+				<section id="Repast">
+					<title>Repast</title>
+					<para>The Repast update site is at:</para>
+					<literallayout>http://mirror.anl.gov/pub/repastsimphony/site.xml
+</literallayout>
+					<para>More information on downloading and installing repast can be found 
+						<ulink url="http://repast.sourceforge.net/docs/development.html">here</ulink>. Follow the instrucitons for "Configuration B".
+					</para>
+				</section>
+			</section>
+		</section>
+		<section id="Models">
+			<title>Models</title>
+			<section id="Obtaining_Example_Models">
+				<title>Obtaining Example Models</title>
+				<para>There is a cheat-sheet available for obtaining the example models. If you would rather obtain them yourself, here is the CVS information:</para>
+				<section id="Team_Project_Sets">
+					<title>Team Project Sets</title>
+					<para>You can use the following team project sets. See 
+						<ulink url="http://help.eclipse.org/galileo/topic/org.eclipse.platform.doc.user/tasks/tasks-cvs-project-set.htm">this document</ulink> for more information about using project sets.
+					</para>
+					<literallayout>http://eclipse.org/amp/project-sets/ascape.psf
+http://eclipse.org/amp/project-sets/escapeAMFExamples.psf
+</literallayout>
+				</section>
+				<section id="From_Version_Control_Systems">
+					<title>From Version Control Systems</title>
+					<para>Import the CVS projects from the AMP project repository. For help, see 
+						<ulink url="http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/reference/ref-40a.htm">this page</ulink>. Here are the details for CVS Access:
+					</para>
+					<para>CVS Repository:</para>
+					<literallayout>Connection type:	pserver
+User:	anonymous
+Password:	[none]
+Host:	dev.eclipse.org
+Path:	/cvsroot/modeling
+Module:	/org.eclipse.amp
+</literallayout>
+					<para>AMF Escape Models:</para>
+					<literallayout>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape 
+</literallayout>
+					<para>AMF Ascape and Repast Models:</para>
+					<literallayout>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape 
+org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast 
+</literallayout>
+					<para>The Ascape example projects are available at the Sourceforge SVN server. You can get them at the following locations. See the 
+						<ulink url="/wiki/http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php_Subversive_User_Guide">http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php Subversive User Guide</ulink> for more information about using SVN. (You'll need to install Subversion if you don't already have it.)
+					</para>
+					<para>Escape Java Models:</para>
+					<literallayout>https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.models.brook
+https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.models.examples
+</literallayout>
+					<para>Ascape (Swing-based) Java Models:</para>
+					<literallayout>https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.examples
+https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.brook
+</literallayout>
+				</section>
 			</section>
 		</section>
 	</chapter>
 	<chapter id="Resources">
 		<title>Resources</title>
-		<section id="Obtaining_Example_Models">
-			<title>Obtaining Example Models</title>
-			<para>There is a cheat-sheet available for obtaining the example models. If you would rather obtain them yourself, here is the CVS information:</para>
-			<section id="Import_from_CVS">
-				<section>
-					<title>Import from CVS</title>
-					<itemizedlist>
-						<listitem>
-							<para>Import the CVS projects from the AMP project repository. For help, see 
-								<ulink url="http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/reference/ref-40a.htm">this page</ulink>. For repository details, see 
-								<ulink url="http://eclipse.org/amp/developers/repositoryDetails.php">http://eclipse.org/amp/developers/repositoryDetails.php</ulink>. These are the example projects:
-							</para>
-						</listitem>
-					</itemizedlist>
-					<literallayout>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape 
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape 
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast 
-</literallayout>
-					<itemizedlist>
-						<listitem>
-							<para>Right-click on the models to execute them.</para>
-						</listitem>
-						<listitem>
-							<para>Play around with the model attribute settings and behavior (Acts).</para>
-						</listitem>
-					</itemizedlist>
-				</section>
-			</section>
-		</section>
 		<section id="Websites">
 			<title>Websites</title>
 			<para>
@@ -3319,7 +3486,7 @@
 			<section id="General_Support.2C_Questions_and_Discussion">
 				<title>General Support, Questions and Discussion</title>
 				<para>The 
-					<ulink url="http://www.eclipse.org/forums/index.php?t=thread&amp;frm_id=17&amp;S=f4fa6cb31327772a3b626dc409db409b">Agent Modeling Platform Newsgroup</ulink> is the place to discuss or get support for any of the Eclipse AMP tools. 
+					<ulink url="http://www.eclipse.org/forums/index.php?t=thread&amp;frm_id=17&amp;S=f4fa6cb31327772a3b626dc409db409b">Agent Modeling Platform Newsgroup</ulink> is the place to discuss or get support for any of the Eclipse AMP tools. Don't hesitate to ask questions about model implementation or bring up more general topics for discussion.
 				</para>
 			</section>
 			<section id="View_Existing_Bugs_and_Feature_Requests">
@@ -3342,6 +3509,9 @@
 					<ulink url="https://dev.eclipse.org/mailman/listinfo/amp-dev">https://dev.eclipse.org/mailman/listinfo/amp-dev</ulink>.
 				</para>
 			</section>
+		</section>
+		<section id="Other_Contacts">
+			<title>Other Contacts</title>
 			<section id="Professional_Support">
 				<title>Professional Support</title>
 				<para>The AMP project developers -- among the most experienced developers of agent models and tools anywhere -- are naturally the best source for Agent Modeling development, support and training. Please feel free to contact the project lead or other project contributors directly to discuss professional support options.</para>
@@ -3351,10 +3521,6 @@
 				<para>For project related but non-public communications such as media enquires or potential project sponsorship, please contact Miles Parker, the Eclipse AMP project lead, at amp_enquiry@metascapeabm.com. (Requests for support and other communications to this address will be ignored.)</para>
 			</section>
 		</section>
-		<section id="Feedback">
-			<title>Feedback</title>
-			<para>If you have ideas, comments or requests for information about the project please contact us at the .</para>
-		</section>
 		<section id="Get_Involved">
 			<title>Get Involved</title>
 			<para>If you find this tool valuable, please be aware that most of its development occurred through volunteer contributions from individuals and companies that have received no direct funding. You can support continual development efforts financially by purchasing related software tools from companies and organizations that help develop it, including funding for developer time in grant proposals. You can support the Eclipse platform in general by becoming a member organization of Eclipse. But the most important thing that you can contribute is your own time and enthusiasm, either through directly contributing to AMP or by promoting its use in blogs and other social media. For more detailed information about contributing to AMP, please see 
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/build/ampPDF.xml b/org.eclipse.amp/doc/org.eclipse.amp.doc/build/ampPDF.xml
index ba9f987..727a6b7 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/build/ampPDF.xml
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/build/ampPDF.xml
@@ -4,6 +4,50 @@
 		<title>Introduction</title>
 		<para>In this manual we provide an in-depth understanding of what goes into an Agent Model, how you can use the Agent Modeling Framework and related tools to design one and present tutorials to get you started. But before going into details, let's take a quick overview at what agent-based modeling is is and how the Agent Modeling Framework can help you to develop models for ABM or other problem domains.</para>
 		<para>We hope you enjoy using the tool, and we look forward to your comments and feedback and most of all participation!</para>
+		<section id="Quick_Start">
+			<title>Quick Start</title>
+			<para>If you're the kind of person who likes to jump right in, here are the basics.</para>
+			<section id="Install">
+				<title>Install</title>
+				<para>If you're using a complete IDE, or have already installed AMP from the Eclipse update sites, you can ignore this step. Otherwise, refer to the Installation Guide at the end of this manual.</para>
+			</section>
+			<section id="Welcome.21">
+				<title>Welcome!</title>
+				<para>When you first run the tools, you will see a welcome screen. If the screen isn't showing, select the 
+					<emphasis role="bold">Help &gt; Welcome</emphasis> menu. Click on the "Overview", "Samples" or "Tutorials" buttons to begin your exploration.
+				</para>
+			</section>
+			<section id="Cheat.21">
+				<title>Cheat!</title>
+				<para>The Agent Modeling tools come with a number of "Cheat Sheets" to help get you started. You can access them by selecting 
+					<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis>. Then under the "Agent Modeling" category, select a cheat sheet, such as "Load Sample Projects".
+				</para>
+			</section>
+			<section id="Follow_the_Tutorial">
+				<title>Follow the Tutorial</title>
+				<para>The tools also come with extensive tutorials. See the "Tutorials" section for more help on that.</para>
+			</section>
+			<section id="Follow_your_Interest">
+				<title>Follow your Interest</title>
+				<para>AMP has many potential facets and use cases. Check out the following sections of the manual for more information about..</para>
+				<section id="ABM_Researchers">
+					<title>ABM Researchers</title>
+					<para>Run an example model using the "Run an Example Model" cheat sheet.</para>
+				</section>
+				<section id="ABM_Modelers">
+					<title>ABM Modelers</title>
+					<para>Create Agent-Based models using simple visual tools and deploy them to a number of popular ABM platforms, including Escape. Follow the tutorial section of the Modeler's guide.</para>
+				</section>
+				<section id="ABM_Java_Developers">
+					<title>ABM Java Developers</title>
+					<para>Write "Plain Old Java" models within a full-featured agent-based modeling framework. Read Programmers Guide and then try the "Create an Escape Java Model" cheat sheet.</para>
+				</section>
+				<section id="Eclipse_Plugin_Developers">
+					<title>Eclipse Plugin Developers</title>
+					<para>AXF and AGF provide a number of features based around Eclipse technologies such as GEF, GEF3D, BIRT Charts and Zest. For example, AGF supports dynamic visualization of objects in space, and AXF supports managed UI and headless execution for models of any kind. There isn't currently any general documentation for these features, but we encourage you to look at the APIs and at Escape's implementation of them. They're straightforward and can be useful for a variety of general science platform needs.</para>
+				</section>
+			</section>
+		</section>
 		<section id="Agent-Based_Modeling">
 			<title>Agent-Based Modeling</title>
 			<para>The primary focus of the Agent Modeling Platform tools is "Agent-Based Modeling" (ABM). ABM is an innovative technique used to explore complex phenomenon in many domains, including economics, social sciences, biomedicine, ecology and business operations. ABMs share characteristics with object models, but are:</para>
@@ -48,27 +92,14 @@
 			<para>Existing scientific models are very good at representing relatively simple systems, but generally speaking aren't very good at representing complex systems. The world is full of complex systems, and our misunderstanding of these systems has prevented us from addressing many of the key challenges facing the world, including the global financial crisis and climate change -- in fact once could argue that our misunderstanding of these systems has strongly contributed to these crises.</para>
 			<para>Agent-Based Models (ABMs) seek to represent important real-world dynamics by designing communities of software agents that mimic real entities. Rather than make simplifying assumptions about such systems and then representing them in equation form or as off the shelf algorithmic constructs, the ABM researcher aims to identify key agent state, interaction spaces, and behaviors. Agents are then "let loose" on our computers and we explore what happens next. The computational horsepower exists today to simulate large numbers (e.g. &gt;&gt;10) of interacting, adaptive and autonomous agents but often desktop computers are all we need to explore significant domains. ABMs have been designed to represent all kinds of important natural systems, at scales reaching from cellular mechanics to international trade and are being used to solve truly hard problems in government, business, and academia. ABMs are not a solution to every problem, but they can help us to appreciate and gain unique insight into many systems, and often they can help us to come up with better practical decisions than we might using classic approaches.</para>
 		</section>
-		<section id="Other_Uses">
-			<title>Other Uses</title>
+		<section id="Other_Domains">
+			<title>Other Domains</title>
 			<para>Many kinds of objects share characteristics of ABM agents -- after all, software agents are used in many other contexts. The Agent Modeling Framework meta-modeling support is potentially suitable (or extendible) for a number of approaches outside of ABM; for example business rules, object interactions, systems dynamics models and traditional discrete event models. Similarly, AMP execution and graphic support can be used for modeling natural systems but could also be used to manage other software agents -- for example independent reasoning tasks or dynamic visualization support.</para>
 		</section>
-		<section id="Credits">
-			<title>Credits</title>
-			<para>Miles Parker is a consultant and software developer with over ten years of experience in the agent-based modeling field and twenty years developing object-oriented tools and frameworks and is the architect and project lead for the Eclipse Agent Modeling Platform (Incubation).</para>
-			<para>Metascape, LLC is the primary contributor to AMP and provides Agent-Based Modeling tools, including sophisticated tools based on the AMF platform, and comprehensive consulting services. For more information on Metascape products and services visit 
-				<ulink url="http://metascapeabm.com">http://metascapeabm.com</ulink>.
-			</para>
-			<para>The AMF meta-model started life as 
-				<ulink url="/wiki/http://www.agent2005.anl.gov/2006procpdf/Parker_Agent_2006.pdf">"score"</ulink>, a component of the Repast Simphony environment. Argonne National Labs supported the initial development in 2007 and agreed to contribute the relevant IP to the Eclipse project in 2009. It wasn't fully utilized within Simphony, and migrated from there to the MetaABM project supported by Metascape. The MetaABM project defined a complete editor, code-generation and model execution suite that formed the initial AMP AMF contribution. Metascape has sponsored the development of AMF from 2007 through the present.
-			</para>
-			<para>The AMP logo was inspired by the 
-				<ulink url="/wiki/http://swarm.org_Swarm_logo">http://swarm.org Swarm logo</ulink> with their kind permission.
-			</para>
-		</section>
 		<section id="The_Agent_Modeling_Platform_.28AMP.29">
 			<title>The Agent Modeling Platform (AMP)</title>
-			<para>The Eclipse Agent Modeling Project (Incubation) or "AMP" provides extensible frameworks and exemplary tools for representing, editing, generating,
-				executing and visualizing agent-based models (ABMs) and any other domain requiring spatial, behavioral and functional features. AMP has two main themes that complement but don't depend on one another, modeling of agent systems (AMF) and execution and exploration of those systems (AXF, AGF and Escape).</para>
+			<para>The Eclipse Agent Modeling Project (Incubation) or "AMP" provides the core support for both open source and commercial modeling tools. AMP in turn is built upon Elipse, the most powerful, well-supported and popular Integrated Development Platform (IDE) available anywhere.</para>
+			<para>AMP provides extensible frameworks and exemplary tools for representing, editing, generating, executing and visualizing ABMs and any other domain requiring spatial, behavioral and functional features. AMP has two main themes that complement but don't depend on one another, modeling of agent systems (AMF) and execution and exploration of those systems (AXF, AGF and Escape).</para>
 			<para>The overall AMP architecture and project dependencies are summarized in the architectural diagram below:</para>
 			<para>
 				<mediaobject>
@@ -94,40 +125,18 @@
 				<para>Escape is an exemplar ABM toolset. It's based on Ascape, which has been in use for more than 10 years. The core API is very stable, and that should give users a way to explore the features of AMP without concerns about keeping in synch with the rapidly evolving AXF /AGF API. It allows modelers to code in Java and/or generate models with AMF and then execute those models within the same development environment. Escape is the primary target for most of the models in this guide. Those users interested in writing code directly to the Escape API can refer to the Programmer Guide.</para>
 			</section>
 		</section>
-		<section id="Getting_Started">
-			<title>Getting Started</title>
-			<para>AMP has many potential facets and use cases.</para>
-			<section id="Setting_up_Eclipse">
-				<title>Setting up Eclipse</title>
-				<para>If you're reading this from the Eclipse help browser, you've already done this! Otherwise, if you aren't using a full download version of AMP, you'll need to 
-					<ulink url="http://eclipse.org/amp/installing/">install it</ulink>. Once you've done that, select the 
-					<emphasis role="bold">Help &gt; Help Contents</emphasis> menu, find the Agent Modeling Guide and open this overview page within that guide.
-				</para>
-				<para>Some installations will also include a Welcome screen which will guide you through the same set of steps.</para>
-			</section>
-			<section id="Get_the_Example_Projects">
-				<title>Get the Example Projects</title>
-				<para>You can do that using a cheat sheet. Select 
-					<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis> and then under the "Agent Modeling" category, select "Load Sample Projects".
-				</para>
-				<para>Then check out the following sections of the manual for more information about..</para>
-			</section>
-			<section id="ABM_Researchers">
-				<title>ABM Researchers</title>
-				<para>Run an example model using the "Run an Example Model" cheat sheet.</para>
-			</section>
-			<section id="ABM_Modelers">
-				<title>ABM Modelers</title>
-				<para>Create Agent-Based models using simple visual tools and deploy them to a number of popular ABM platforms, including Escape. Follow the tutorial section of the Modeler's guide.</para>
-			</section>
-			<section id="ABM_Java_Developers">
-				<title>ABM Java Developers</title>
-				<para>Write "Plain Old Java" models within a full-featured agent-based modeling framework. Read Programmers Guide and then try the "Create an Escape Java Model" cheat sheet.</para>
-			</section>
-			<section id="Eclipse_Plugin_Developers">
-				<title>Eclipse Plugin Developers</title>
-				<para>AXF and AGF provide a number of features based around Eclipse technologies such as GEF, GEF3D, BIRT Charts and Zest. For example, AGF supports dynamic visualization of objects in space, and AXF supports managed UI and headless execution for models of any kind. There isn't currently any general documentation for these features, but we encourage you to look at the APIs and at Escape's implementation of them. They're straightforward and can be useful for a variety of general science platform needs.</para>
-			</section>
+		<section id="Credits">
+			<title>Credits</title>
+			<para>Miles Parker is a consultant and software developer with over ten years of experience in the agent-based modeling field and twenty years developing object-oriented tools and frameworks and is the architect and project lead for the Eclipse Agent Modeling Platform (Incubation).</para>
+			<para>Metascape, LLC is the primary contributor to AMP and provides Agent-Based Modeling tools, including sophisticated tools based on the AMF platform, and comprehensive consulting services. For more information on Metascape products and services visit 
+				<ulink url="http://metascapeabm.com">http://metascapeabm.com</ulink>.
+			</para>
+			<para>The AMF meta-model started life as 
+				<ulink url="/wiki/http://www.agent2005.anl.gov/2006procpdf/Parker_Agent_2006.pdf">"score"</ulink>, a component of the Repast Simphony environment. Argonne National Labs supported the initial development in 2007 and agreed to contribute the relevant IP to the Eclipse project in 2009. It wasn't fully utilized within Simphony, and migrated from there to the MetaABM project supported by Metascape. The MetaABM project defined a complete editor, code-generation and model execution suite that formed the initial AMP AMF contribution. Metascape has sponsored the development of AMF from 2007 through the present.
+			</para>
+			<para>The AMP logo was inspired by the 
+				<ulink url="/wiki/http://swarm.org_Swarm_logo">http://swarm.org Swarm logo</ulink> with their kind permission.
+			</para>
 		</section>
 	</chapter>
 	<chapter id="Modeler_Guide">
@@ -220,24 +229,40 @@
 						<section id="Type">
 							<title>Type</title>
 							<para>These can be anyone of the following: </para>
-							<informaltable frame="none">
-								<tr>
-									<td rowspan="1" colspan="1">Boolean</td>
-									<td rowspan="1" colspan="1">A value that is simply true or false. Note that unless this value really is a simple binary value, you should consider using state instead. (See details below.) For example, rather than representing gender as a 'Female' boolean value, define a 'Gender' state with values 'Male' and "Female'. Generated artifacts and documentation will be much clearer, and you'll be able to easily modify the model later if for example you discover that there are more than two potential gender categories that are relevant to your model.</td>
-								</tr>
-								<tr>
-									<td rowspan="1" colspan="1">Integer</td>
-									<td rowspan="1" colspan="1">A discrete whole number value, such as "100", "-1", "10029920". It's generally a good idea to represent any value that can never have a decimal value as an integer.</td>
-								</tr>
-								<tr>
-									<td rowspan="1" colspan="1">Real</td>
-									<td rowspan="1" colspan="1">A continuous number value. While these are typically represented in software as floating point numbers, they can conceivably represent numbers at any arbitrary precision and in any scheme. Note that while technically speaking we should be representing irrational numbers, this is not currently supported for default values and users should simply use the closest decimal approximation.</td>
-								</tr>
-								<tr>
-									<td rowspan="1" colspan="1">Symbol</td>
-									<td rowspan="1" colspan="1">A string representing some state. More precisely, a computationally arbitrary value with contextual meaning. This could be any kind of identifier. For example, you might use it to store some kind of input coding from data that is then converted into an object state. Or it could simply be an agent's name. But theoretically (though this is not currently supported) one could imagine a symbol using an idiogram, an icon or even a sound that identifies or represents the agent in question.</td>
-								</tr>
-							</informaltable>
+							<variablelist>
+								<varlistentry>
+									<term>
+										<emphasis role="bold">Boolean</emphasis>
+									</term>
+									<listitem>
+										<para>A value that is simply true or false. Note that unless this value really is a simple binary value, you should consider using state instead. (See details below.) For example, rather than representing gender as a 'Female' boolean value, define a 'Gender' state with values 'Male' and "Female'. Generated artifacts and documentation will be much clearer, and you'll be able to easily modify the model later if for example you discover that there are more than two potential gender categories that are relevant to your model.</para>
+									</listitem>
+								</varlistentry>
+								<varlistentry>
+									<term>
+										<emphasis role="bold">Integer</emphasis>
+									</term>
+									<listitem>
+										<para>A discrete whole number value, such as "100", "-1", "10029920". It's generally a good idea to represent any value that can never have a decimal value as an integer.</para>
+									</listitem>
+								</varlistentry>
+								<varlistentry>
+									<term>
+										<emphasis role="bold">Real</emphasis>
+									</term>
+									<listitem>
+										<para>A continuous number value. While these are typically represented in software as floating point numbers, they can conceivably represent numbers at any arbitrary precision and in any scheme. Note that while technically speaking we should be representing irrational numbers, this is not currently supported for default values and users should simply use the closest decimal approximation.</para>
+									</listitem>
+								</varlistentry>
+								<varlistentry>
+									<term>
+										<emphasis role="bold">Symbol</emphasis>
+									</term>
+									<listitem>
+										<para>A string representing some state. More precisely, a computationally arbitrary value with contextual meaning. This could be any kind of identifier. For example, you might use it to store some kind of input coding from data that is then converted into an object state. Or it could simply be an agent's name. But theoretically (though this is not currently supported) one could imagine a symbol using an idiogram, an icon or even a sound that identifies or represents the agent in question.</para>
+									</listitem>
+								</varlistentry>
+							</variablelist>
 							<para>(Undefined and Numeric types should not be used within a well-defined model.)</para>
 						</section>
 						<section id="Default_Value">
@@ -289,13 +314,17 @@
 							<para>A value representing what happens to an agent when that agent is asked to move beyond its extent.</para>
 							<variablelist>
 								<varlistentry>
-									<term>Periodic</term>
+									<term>
+										<emphasis role="bold">Periodic</emphasis>
+									</term>
 									<listitem>
 										<para>When encountering an edge, the agent will treat the space as wrapping around to the other side of the space. For example, if the agent at location {1,2} (0-based) within a Moore space (see grid discussion below) of size {10,10} is asked to find some other agent within distance 3, the agent look in the square defined between {8,9} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge. You can imagine this as taking a piece of graph paper and connecting the opposite edges. You can't actually do that with paper, but if you could you would have a toroidal (donut) shape in three dimensions defining the shape in two.</para>
 									</listitem>
 								</varlistentry>
 								<varlistentry>
-									<term>APeriodic</term>
+									<term>
+										<emphasis role="bold">APeriodic</emphasis>
+									</term>
 									<listitem>
 										<para>When encountering an edge, the agent treats it as the edge of the space. For example, if the agent at location {1,2} is asked to find some other agent within distance 3, the agent look between {0,0} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge.</para>
 									</listitem>
@@ -321,13 +350,17 @@
 							<para>This value determines what constitutes a region within a particular distance from the agent. The value for this is often critical in obtaining particular behavior from a model, and shouldn't be overlooked. There are three possible values:</para>
 							<variablelist>
 								<varlistentry>
-									<term>Euclidean</term>
+									<term>
+										<emphasis role="bold">Euclidean</emphasis>
+									</term>
 									<listitem>
 										<para>The distance between any two cells is taken to be the "real" distance. For example, if an agent was within a chess board, and we wanted to find all agents within distance three of it, we could determine that by taking a string of length 3, tacking it to the center of the source square, and including all cells whose centers we can reach with the other string end. Note that although Euclidean space may seem the most reasonable neighborhood configuration to choose, this really isn't the case. Euclidean space is continuous whereas grid space is discrete, and mapping the two to each other can create unexpected issues. Still, this is a good choice for models representing notional real spaces.</para>
 									</listitem>
 								</varlistentry>
 								<varlistentry>
-									<term>Moore</term>
+									<term>
+										<emphasis role="bold">Moore</emphasis>
+									</term>
 									<listitem>
 										<para>Here, the distance between any two cells is defined by the number of edge 
 											<emphasis role="italic">or</emphasis> corner adjacent cells crossed to get between them. To continue the chess board analogy, this is the set of moves that a king can make. Note that this does not map well to real space at all, as a cell at distance 1 in a moore space is at distance sqrt(2) in "real" space.
@@ -335,7 +368,9 @@
 									</listitem>
 								</varlistentry>
 								<varlistentry>
-									<term>Von-Neumann</term>
+									<term>
+										<emphasis role="bold">Von-Neumann</emphasis>
+									</term>
 									<listitem>
 										<para>Here, the distance between any two cells is defined by the number of edge adjacent cells crossed to get between them. This is the set of moves that a rook might make on a chess board -- if a rook could only move one square at a time. It is also often referred to as a Manhattan distance for the self-evident reason.</para>
 									</listitem>
@@ -3047,163 +3082,54 @@
 			</para>
 			<para>A primary purpose of the Escape project -- apart from the obvious goal of providing a nice Eclipse hosted ABM toolkit -- is to provide an exemplar to demonstrate how any arbitrary agent modeling framework can be integrated within the AMP environment. A cool aspect of this is that AMP has no dependencies on Escape, but also that the underlying ABM modeling framework for Escape has no dependencies on AMP -- instead Escape simply provides the runtime glue between AMP and the ABM framework. The underlying ABM framework uses the Ascape API, an API that first began development more than ten years ago and that has not been modified at all in order for it to work within the AMP environment.</para>
 		</section>
-		<section id="Getting_Started_2">
-			<title>Getting Started</title>
-			<section id="Documentation_and_other_Resources">
-				<title>Documentation and other Resources</title>
-				<para>Because it's API is based on Ascape, Escape is one component of AMP that already has extensive documentation. There is complete Javadoc as well as a manual and other web resources. See the 
-					<ulink url="http://ascape.sourceforge.net">Ascape Website</ulink> to locate these resources. There is a 
-					<ulink url="http://ascape.sourceforge.net/docs/TheAscapeManual5.pdf">full manual</ulink> for Ascape available on that site. Or, you can install the Ascape Manual into the eclipse help system by adding the following update site and selecting the "Documentations and Source Code" feature.
-				</para>
-				<para>
-					<ulink url="http://ascape.sourceforge.net/eclipse">http://ascape.sourceforge.net/eclipse</ulink>
+		<section id="Documentation">
+			<title>Documentation</title>
+			<para>In addition to this documentation, there are a number of other resources available related to Escape development. Because it's API is based on Ascape, a lot of resources developed for Ascape are equally applicable to Ascape. The Ascape documentation is bundled with some distributions of the AMP tools, but if you are using the Eclipse AMP download, you can access it online or install it from the Ascape update site.</para>
+			<section id="Online">
+				<title>Online</title>
+				<para>There is a complete 
+					<ulink url="http://ascape.sourceforge.net/api/index.html">Javadoc</ulink> as well as an 
+					<ulink url="http://ascape.sourceforge.net/docs/TheAscapeManual5.pdf">excellent manual</ulink> and other web resources. See the 
+					<ulink url="http://ascape.sourceforge.net">Ascape Website</ulink> for general information.
 				</para>
 			</section>
-			<section id="Installation">
-				<title>Installation</title>
-				<para>Escape is 
-					<ulink url="http://eclipse.org/amp/installing/">installed</ulink> by default with the other model components. If you want to do 3D (really 2 1/2) visualizations, you will want AGF3D and the LWJGL dependency. You can build from source but in that case you'l need to launch a self-hosted runtime, so it's best to simply install from the update site if you're not actually doing AMP development.
-				</para>
+			<section id="Update_Site">
+				<title>Update Site</title>
+				<para>Or, you can install the Ascape Manual into the eclipse help system by adding the following update site and selecting the "Documentations and Source Code" feature. See the Installation Guide for more information.</para>
+				<literallayout format="linespecific" class="normal">http://ascape.sourceforge.net/eclipse
+</literallayout>
 			</section>
 		</section>
-		<section id="Developing_Models">
-			<title>Developing Models</title>
-			<para>The easiest way for Java developers to get started doing agent-based modeling in Eclipse is to begin to write programs using it. To develop new models, you can:</para>
-			<orderedlist inheritnum="ignore" continuation="restarts">
-				<listitem>
-					<para>Create a new Escape project. The Escape projects are actually configured for AMF code generation so there are dependencies and builders in there that you don't need; you can remove all of the escape builders and any of the kitchen sink items. The "Create an Escape Java Model" cheat sheet will walk you through the process of creating a new Java based project and model.</para>
-				</listitem>
-				<listitem>
-					<para>Or for more experienced Eclipse users, you can simply to just create a new Plugin Project and add the necessary dependencies there. Have a look at the example escape project to see what you need. Note that you will likely need more dependencies then you need to simply build -- this is because the class loader uses the classes from the project path and so runtime classes have to be there as well. We may simply package an Eclipse runtime convenience plugin to gather these dependencies up a bit.</para>
-				</listitem>
-			</orderedlist>
-			<para>Then just create new Java classes for your root model scape and agents just as you would for an Ascape project.</para>
+		<section id="Installation">
+			<title>Installation</title>
+			<para>See the Installation Guide for Detailed Information -- that all applies to general Escape usage as well.</para>
+			<para>Note that there are no dependendencies on AMF, and therefore EMF or any other modeling technologies to do Java development for Escape or for running generated models within Escape. The deployment environment can be quite light-weight. Simply install the AXF, AGF, and AMP Escape features. You can build from source but in that case you'l need to launch a self-hosted runtime, so it's best to simply install from the update site if you're not actually doing AMP development.</para>
+			<para>Escape is 
+				<ulink url="http://eclipse.org/amp/installing/">installed</ulink> by default with the other model components. If you want to do 3D (really 2 1/2) visualizations, you will want AGF3D and the LWJGL dependency.
+			</para>
 		</section>
-		<section id="More_Information">
-			<title>More Information</title>
-			<section id="Integrating_Java_and_AMF_Models">
-				<title>Integrating Java and AMF Models</title>
-				<para>If you're like many Java developers, you might find point-and-click interfaces a bit lame. Personally, I've changed my tune in this, and I now define all of my ABM models from the editor, saving Java for truly specialized tasks. But even without generation of agent behavior, Acore can be a really valuable tool, as the GIS example shows. The way to look at metaABM is as a way to compose your overall model and automate the tedious parts. Apart from Java generated code, the AMF meta-model maintains a number of very useful artifacts. For example, the Repast Simphony target maintains model.score and all of the model.rs component. Generally, AMF should save time and hassle while making your models far more transparent even if you never use the Actions component to define agent behavior.</para>
-				<section id="Method_Action">
-					<title>Method Action</title>
-					<para>As explained in the action section, you can simply create a "Method" act with hand-written Java code. This option is nice because all code is contained within the AMF file. But it can be difficult to maintain large blocks of Java code as you aren't using a Java editor to edit the Java code itself. One way to get around this is to create your code in the generated Java method and then copy it into the Method action. Note one imporant issue here -- you'll generally have to fully qualify your Java references as you won't be able to change the imports statements directly. </para>
-				</section>
-				<section id="Protected_Code_Regions">
-					<title>Protected Code Regions</title>
-					<para>You can mix and match Action behavior with Java and generated code with POJOs. One way to do this is through using protected regions. Select the agent you want to create protected methods for and then select "Generate Protected" from the "Mode" property. Now, create actions just as you have before, or use your existing ones. On code generation, open up the relevant java file and examine the methods that have been created. </para>
-					<para>
-						<mediaobject>
-							<imageobject>
-								<imagedata fileref="images/pojo/ProgrammingPojoGenerateProps.png" scale="50"/>
-							</imageobject>
-						</mediaobject>
-					</para>
-					<para>You can put whatever you want within the PROTECTED REGION comments and those changes will be preserved when the model is regenerated. You can create a schedule, rule or watcher, maintain custom code for the actual implementations, and still have the model adapt to changes in the underlying data structure -- if for example you want to import a modified shape file.</para>
-					<para>
-						<mediaobject>
-							<imageobject>
-								<imagedata fileref="images/pojo/ProgrammingPojoGenerateCode.png" scale="50"/>
-							</imageobject>
-						</mediaobject>
-					</para>
-				</section>
-				<section id="Implement_Sub-classes">
-					<title>Implement Sub-classes</title>
-					<para>Another approach which can be more robust is to generate the basic model stubs (like an abstract base class except that it isn't abstract) and then override your model with implementations. AMF provides support for generic skeletons and interfaces.</para>
-					<para>
-						<mediaobject>
-							<imageobject>
-								<imagedata fileref="images/pojo/ProgrammingPojoGenerate.png" scale="50"/>
-							</imageobject>
-						</mediaobject>
-					</para>
-				</section>
-			</section>
-			<section id="Converting_Existing_Ascape_models">
-				<title>Converting Existing Ascape models</title>
-				<para>There are only a few changes should have to make to existing Ascape models or to use existing Ascape documentation to develop Escape models.</para>
-				<section id="Model">
-					<title>Model</title>
-					<para>The core model is completely API compatible. No changes!</para>
-				</section>
-				<section id="View">
-					<title>View</title>
-					<para>Because Escape uses SWT and Ascape uses Swing, there are a few unavoidable incompatibilities. Most of these we avoid by using higher level APIs but here are the key changes that you're likely to have to make:</para>
-					<section id="Convert_the_low-level_imports_from_AWT_and_Swing_to_SWT">
-						<title>Convert the low-level imports from AWT and Swing to SWT</title>
-						<para>The simplest way to accomplish this is to remove all of the imports and then organize imports. For example:</para>
-						<literallayout format="linespecific" class="normal">java.awt.Color =&gt; org.eclipse.swt.graphics.Color
-java.awt.Graphics =&gt; org.eclipse.draw2d.Graphics
-</literallayout>
-						<para>Then just do a global find for all of the imports and replace them with nothing. This is a great place for a regexp. Try:</para>
-						<literallayout format="linespecific" class="normal">find: import java\.awt\.(.*);
-replace: [nothing]
-</literallayout>
-						<para>You don't have to replace these with the SWT equivalents, just click on the project, right-click and choose "Source:Organize Imports.."
-							By the way, a great way to avoid having to select the right entries in optimize imports and to alert you when you have missed anything is to prevent the awt and swing classes from being used at all. Right-click on project, choose "Build Path:Configure Build Path", go to Libraries tab, open JRE System Library, choose "Access Rules", edit, and then add entries for java/awt/** and javax/swing/**. The code will regenerate and you'll have error markers for all of the stuff that won't work with Escape and Eclipse.</para>
-					</section>
-					<section id="Convert_color_features">
-						<title>Convert color features</title>
-						<para>You can't use AWT colors either so you'll need to replace any colors. AMP provides a convenience classes for Colors called ColorFeature and ColorFeatureConcrete. You can use these or any of the other ways to define SWT colors. For example:</para>
-						<literallayout format="linespecific" class="normal">Color.lightGray =&gt; ColorFeature.LIGHT_GRAY
-new Color(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy) =&gt; 
-    ColorFeatureConcrete.create(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy)
-</literallayout>
-					</section>
-					<section id="Change_agent_color_getters">
-						<title>Change agent color getters</title>
-						<para>If you've defined colors through overriding Agents as in most models, you'll need to change the method signature. You could just do a global replace for this one.</para>
-						<literallayout format="linespecific" class="normal">public Color getColor( =&gt; public Object getPlatformColor(
-</literallayout>
-					</section>
-					<section id="Get_rid_of_image_features">
-						<title>Get rid of image features</title>
-						<para>Escape doesn't support them. In practice they haven't been used a lot. At some point perhaps we'll have nice sprite support instead. :)</para>
-						<literallayout format="linespecific" class="normal">public Image getImage() {**} =&gt; ""
-</literallayout>
-					</section>
-					<section id="Modify_usages_of_DrawFeatures">
-						<title>Modify usages of DrawFeatures</title>
-						<para>If you've created any of your own draw features, you'll need to change them slightly to accommodate the differences between the AWT and SWT / Draw2D APIs. This should be pretty straightforwrd. For example:</para>
-						<literallayout format="linespecific" class="normal">g.setColor(...
-g.fillOval(..
-becomes:
-g.setBackgroundColor(
-g.fillOval(..
-</literallayout>
-						<para>That's about it, though it's probable that we've missed something. Please post a message on the amp newsgroup if you run into any other conversion issues.</para>
-					</section>
-				</section>
-				<section id="Configuration">
-					<title>Configuration</title>
-					<para>Instead of using Ant, Escape has really nice support for parameterizing and testing models. See 
-						<ulink url="/wiki/Experimenting_and_Testing">Experimenting and Testing</ulink> (todo). If you do want to work with ant you will need to install the plugins from the Sourceforge download site. (These have dependencies that I didn't want to bother with going through the Eclipse IP process to get in. If for some reason you think these should be part of core Escape let Miles know and I'll take care of it.) Ant has not been tested for Escape so it's not even clear it will work.
-					</para>
-				</section>
-			</section>
-		</section>
-		<section id="Running_Agent_Models">
-			<title>Running Agent Models</title>
+		<section id="Example_Java_Models">
+			<title>Example Java Models</title>
 			<section id="Exploring_Example_ABM_Models">
 				<title>Exploring Example ABM Models</title>
 				<para>The first thing most people will want to do in AMP is to play with the example models. You can explore AMF models as well as some really interesting classic ABM models.</para>
-				<section id="Downloading_Models">
-					<title>Downloading Models</title>
-					<para>To obtain the models, simply launch the cheat sheet. Go to the 
-						<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis> menu and choose "Load Sample Projects".
-					</para>
-					<para>Or you can get them yourself from the following locations:</para>
+				<section id="Installing_Models">
+					<title>Installing Models</title>
+					<para>See the Installation Guide to find out how to get the example models.</para>
 					<section id="AMF_Models">
 						<title>AMF Models</title>
+						<para>All AMF models produce pure Java code so they can be used like any other Escape Java model.</para>
 						<literallayout format="linespecific" class="normal">org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape
 </literallayout>
-						<para>To understand the capabilities of AMF, you might also want to try out running the same models automatically generated for Ascape or Repast. These are located at dev.eclipse.org in cvsroot/modeling:</para>
+						<para>To understand the capabilities of AMF in producing other kinds of Java models, you might also want to try out running the same models automatically generated for Ascape or Repast. These are located at dev.eclipse.org in cvsroot/modeling:</para>
 						<literallayout format="linespecific" class="normal">org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape
 org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast
 </literallayout>
 					</section>
-					<section id="Escape_.2F_Ascape_Java_Models">
-						<title>Escape / Ascape Java Models</title>
+					<section id="Classic_Escape_.2F_Ascape_Java_Models">
+						<title>Classic Escape / Ascape Java Models</title>
+						<para>Many models have been created using Ascape over the years, including all of the classic models created at Brookings and some other cool models such as Craig Reynold's Boids and a pretty cool little traffic model, and they've all been converted to run in Escape. They're in Java but you can execute and explore them in exactly the same way as the Epidemic model above. All of the Ascape example models have been converted (a straightforward process) from their intial Ascape incarnations. For licensing reasons (they're BSD, not EPL) we can't host them directly on the Eclipse site.  You can get the projects in two ways:</para>
+						<para>Once you've downloaded the projects, open up the src folder and navigate to the Java files for the actual models. For example, to run Conway's Life, you'll want src/edu.brook.life.ConwayLife. Right-click on the Java file and select "Execute". There are many models to explore! (It's not always obvious which Java files are for models, so you may have to poke around a bit. We need to put together a catalog here. Another nice opportunity for user contributions.)</para>
 						<para>These are SVN projects in the sourceforge SVN. For help, see 
 							<ulink url="/wiki/http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php_this_page">http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php this page</ulink>.
 						</para>
@@ -3214,7 +3140,7 @@
 				</section>
 				<section id="Generating_Models">
 					<title>Generating Models</title>
-					<para>There are a number of models developed with AMF that can automatically generate example models to run in Escape. There are two ways to run the example models:</para>
+					<para>And of course, you can always use the AMF tools to generate models and then customize them from there. See the following section on integrating AMF with Java for more on that. There are a number of models developed with AMF that can automatically generate example models to run in Escape. There are two ways to run the example models:</para>
 					<section id="Creating_a_New_Escape_Project">
 						<title>Creating a New Escape Project</title>
 						<para>The best option is to simply create a new Escape project and drag the models into it!</para>
@@ -3223,7 +3149,7 @@
 								<para>If you're not already there, open the Agent Modeling Perspective. Select Window &gt; Open Perspective &gt; Other.. and then Agent Modeling. (Or you can choose Window &gt; Reset Perspective and the Agent Modeling perspective should appear in the Open Perspective list itself.)</para>
 							</listitem>
 							<listitem>
-								<para>Next, let's create the project where we'll place our model. Select File &gt; New &gt; Escape AMF Project. Give it a name like "escape.tutorial", then click Finish.</para>
+								<para>Create the project where we'll place our model. Select File &gt; New &gt; Escape AMF Project. Give it a name like "escape.tutorial", then click Finish.</para>
 							</listitem>
 							<listitem>
 								<para>Finally grab the Epidemic.metaabm model at 
@@ -3234,57 +3160,298 @@
 					</section>
 				</section>
 			</section>
+		</section>
+		<section id="Developing_Models">
+			<title>Developing Models</title>
+			<para>The easiest way for Java developers to get started doing agent-based modeling in Eclipse is to begin to write programs using it. To develop new models, you can:</para>
+			<section id="Cheatsheet">
+				<title>Cheatsheet</title>
+				<para>By far the simplest way to get started is with the cheatsheet. This walks you through the complete process of creating a Java based model. 
+					<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis> and then select "Create an Escape Java Model" from within the "Agent Modeling" category.
+				</para>
+			</section>
+			<section id="Steps">
+				<title>Steps</title>
+				<orderedlist inheritnum="ignore" continuation="restarts">
+					<listitem>
+						<para>Create a new Escape project. The Escape projects are actually configured for AMF code generation so there are dependencies and builders in there that you don't need; you can remove all of the escape builders and any of the kitchen sink items. The "Create an Escape Java Model" cheat sheet will walk you through the process of creating a new Java based project and model.</para>
+					</listitem>
+					<listitem>
+						<para>Or for more experienced Eclipse users, you can simply to just create a new Plug-in Project and add the necessary dependencies there. Have a look at the example escape project to see what you need. Note that you will likely need more dependencies then you need to simply build -- this is because the class loader uses the classes from the project path and so runtime classes have to be there as well. We may simply package an Eclipse runtime convenience plug-in to gather these dependencies up a bit. Then just create new Java classes for your root model scape and agents just as you would for an Ascape project.</para>
+					</listitem>
+				</orderedlist>
+			</section>
+		</section>
+		<section id="Executing_Models">
+			<title>Executing Models</title>
+			<para>See the User Guide Execution Section for information on launching and controling models.</para>
+			<para>We have a complete cheat sheet supporting this tutorial. Simply go to 
+				<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis> and then select "Run an Example Model" from within the "Agent Modeling" category.
+			</para>
 			<section id="Tutorial">
 				<title>Tutorial</title>
 				<para>We've developer have a complete cheat sheet supporting this tutorial. Simply go to 
 					<emphasis role="bold">Help &gt; Cheat Sheets...</emphasis> and then select "Run an Example Model" from within the "Agent Modeling" category.
 				</para>
-				<section id="Next_Steps">
-					<title>Next Steps</title>
-					<para>To understand the capabilities of AMF, you might also want to try out running the same models automatically generated for Ascape or Repast.</para>
-					<literallayout format="linespecific" class="normal">org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast
+			</section>
+		</section>
+		<section id="Extending_and_Customizing_AMP">
+			<title>Extending and Customizing AMP</title>
+			<para>This subject is beyond the scope of this Agent Modeling manual. A future Agent Modeling Platform Guide will discuss these issues in detail. For now, please keep an eye on the Wiki and committer blogs. And of course please ask questions on the AMP forum and developer mailing list. Letting us know you're interested in doing something is the best way to get it documented!</para>
+		</section>
+		<section id="Integrating_Java_and_AMF_Models">
+			<title>Integrating Java and AMF Models</title>
+			<para>If you're like many Java developers, you might find point-and-click interfaces a bit lame. Personally, I've changed my tune in this, and I now define all of my ABM models from the editor, saving Java for truly specialized tasks. But even without generation of agent behavior, Acore can be a really valuable tool, as the GIS example shows. The way to look at metaABM is as a way to compose your overall model and automate the tedious parts. Apart from Java generated code, the AMF meta-model maintains a number of very useful artifacts. For example, the Repast Simphony target maintains model.score and all of the model.rs component. Generally, AMF should save time and hassle while making your models far more transparent even if you never use the Actions component to define agent behavior.</para>
+			<section id="Method_Action">
+				<title>Method Action</title>
+				<para>As explained in the action section, you can simply create a "Method" act with hand-written Java code. This option is nice because all code is contained within the AMF file. But it can be difficult to maintain large blocks of Java code as you aren't using a Java editor to edit the Java code itself. One way to get around this is to create your code in the generated Java method and then copy it into the Method action. Note one imporant issue here -- you'll generally have to fully qualify your Java references as you won't be able to change the imports statements directly. </para>
+			</section>
+			<section id="Protected_Code_Regions">
+				<title>Protected Code Regions</title>
+				<para>You can mix and match Action behavior with Java and generated code with POJOs. One way to do this is through using protected regions. Select the agent you want to create protected methods for and then select "Generate Protected" from the "Mode" property. Now, create actions just as you have before, or use your existing ones. On code generation, open up the relevant java file and examine the methods that have been created. </para>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/pojo/ProgrammingPojoGenerateProps.png" scale="50"/>
+						</imageobject>
+					</mediaobject>
+				</para>
+				<para>You can put whatever you want within the PROTECTED REGION comments and those changes will be preserved when the model is regenerated. You can create a schedule, rule or watcher, maintain custom code for the actual implementations, and still have the model adapt to changes in the underlying data structure -- if for example you want to import a modified shape file.</para>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/pojo/ProgrammingPojoGenerateCode.png" scale="50"/>
+						</imageobject>
+					</mediaobject>
+				</para>
+			</section>
+			<section id="Interface_and_Base_Class_Generation">
+				<title>Interface and Base Class Generation</title>
+				<para>Another approach which can be more robust is to generate the basic model stubs (like an abstract base class except that it isn't abstract) and then override your model with implementations. AMF provides support for generic skeletons and interfaces.</para>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/pojo/ProgrammingPojoGenerate.png" scale="50"/>
+						</imageobject>
+					</mediaobject>
+				</para>
+			</section>
+		</section>
+		<section id="Converting_Existing_Ascape_Models">
+			<title>Converting Existing Ascape Models</title>
+			<para>There are only a few changes should have to make to existing Ascape models or to use existing Ascape documentation to develop Escape models.</para>
+			<section id="Model">
+				<title>Model</title>
+				<para>The core model is completely API compatible. No changes!</para>
+			</section>
+			<section id="View">
+				<title>View</title>
+				<para>Because Escape uses SWT and Ascape uses Swing, there are a few unavoidable incompatibilities. Most of these we avoid by using higher level APIs but here are the key changes that you're likely to have to make:</para>
+				<section id="Convert_the_low-level_imports_from_AWT_and_Swing_to_SWT">
+					<title>Convert the low-level imports from AWT and Swing to SWT</title>
+					<para>The simplest way to accomplish this is to remove all of the imports and then organize imports. For example:</para>
+					<literallayout format="linespecific" class="normal">java.awt.Color =&gt; org.eclipse.swt.graphics.Color
+java.awt.Graphics =&gt; org.eclipse.draw2d.Graphics
+</literallayout>
+					<para>Then just do a global find for all of the imports and replace them with nothing. This is a great place for a regexp. Try:</para>
+					<literallayout format="linespecific" class="normal">find: import java\.awt\.(.*);
+replace: [nothing]
+</literallayout>
+					<para>You don't have to replace these with the SWT equivalents, just click on the project, right-click and choose "Source:Organize Imports.."
+						By the way, a great way to avoid having to select the right entries in optimize imports and to alert you when you have missed anything is to prevent the awt and swing classes from being used at all. Right-click on project, choose "Build Path:Configure Build Path", go to Libraries tab, open JRE System Library, choose "Access Rules", edit, and then add entries for java/awt/** and javax/swing/**. The code will regenerate and you'll have error markers for all of the stuff that won't work with Escape and Eclipse.</para>
+				</section>
+				<section id="Convert_color_features">
+					<title>Convert color features</title>
+					<para>You can't use AWT colors either so you'll need to replace any colors. AMP provides a convenience classes for Colors called ColorFeature and ColorFeatureConcrete. You can use these or any of the other ways to define SWT colors. For example:</para>
+					<literallayout format="linespecific" class="normal">Color.lightGray =&gt; ColorFeature.LIGHT_GRAY
+new Color(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy) =&gt; 
+    ColorFeatureConcrete.create(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy)
 </literallayout>
 				</section>
+				<section id="Change_agent_color_getters">
+					<title>Change agent color getters</title>
+					<para>If you've defined colors through overriding Agents as in most models, you'll need to change the method signature. You could just do a global replace for this one.</para>
+					<literallayout format="linespecific" class="normal">public Color getColor( =&gt; public Object getPlatformColor(
+</literallayout>
+				</section>
+				<section id="Get_rid_of_image_features">
+					<title>Get rid of image features</title>
+					<para>Escape doesn't support them. In practice they haven't been used a lot. At some point perhaps we'll have nice sprite support instead. :)</para>
+					<literallayout format="linespecific" class="normal">public Image getImage() {**} =&gt; ""
+</literallayout>
+				</section>
+				<section id="Modify_usages_of_DrawFeatures">
+					<title>Modify usages of DrawFeatures</title>
+					<para>If you've created any of your own draw features, you'll need to change them slightly to accommodate the differences between the AWT and SWT / Draw2D APIs. This should be pretty straightforwrd. For example:</para>
+					<literallayout format="linespecific" class="normal">g.setColor(...
+g.fillOval(..
+becomes:
+g.setBackgroundColor(
+g.fillOval(..
+</literallayout>
+					<para>That's about it, though it's probable that we've missed something. Please post a message on the amp newsgroup if you run into any other conversion issues.</para>
+				</section>
+				<section id="Configuration">
+					<title>Configuration</title>
+					<para>Instead of using Ant, Escape has really nice support for parameterizing and testing models. See 
+						<ulink url="/wiki/Experimenting_and_Testing">Experimenting and Testing</ulink> (todo). If you do want to work with ant you will need to install the plugins from the Sourceforge download site. (These have dependencies that I didn't want to bother with going through the Eclipse IP process to get in. If for some reason you think these should be part of core Escape let Miles know and I'll take care of it.) Ant has not been tested for Escape so it's not even clear it will work.
+					</para>
+				</section>
 			</section>
-			<section id="Classic_Java_ABM_Models">
-				<title>Classic Java ABM Models</title>
-				<para>Many models have been created using Ascape over the years, including all of the classic models created at Brookings and some other cool models such as Craig Reynold's Boids and a pretty cool little traffic model, and they've all been converted to run in Escape. They're in Java but you can execute and explore them in exactly the same way as the Epidemic model above. All of the Ascape example models have been converted (a straightforward process) from their intial Ascape incarnations. For licensing reasons (they're BSD, not EPL) we can't host them directly on the Eclipse site.  You can get the projects in two ways:</para>
-				<para>Once you've downloaded the projects, open up the src folder and navigate to the Java files for the actual models. For example, to run Conway's Life, you'll want src/edu.brook.life.ConwayLife. Right-click on the Java file and select "Execute". There are many models to explore! (It's not always obvious which Java files are for models, so you may have to poke around a bit. We need to put together a catalog here. Another nice opportunity for user contributions.)</para>
+		</section>
+	</chapter>
+	<chapter id="Installation_Guide">
+		<title>Installation Guide</title>
+		<section id="Tools">
+			<title>Tools</title>
+			<section id="Complete_IDE">
+				<title>Complete IDE</title>
+				<para>You may already have obtained a complete IDE bundled with AMP and other modeling tools. The project contributors offer open source and commercial versions of the AMP tools, which you can find at their sites. If so, you can mostly ignore this chapter unless you want to install an optional component like Repast.</para>
+			</section>
+			<section id="Eclipse_and_the_Agent_Modeling_Tools">
+				<title>Eclipse and the Agent Modeling Tools</title>
+				<para>You can find more detailed instructions 
+					<ulink url="http://eclipse.org/amp/installing/">here</ulink>, but here are the basic steps.
+				</para>
+				<orderedlist inheritnum="ignore" continuation="restarts">
+					<listitem>
+						<para>Install the latest version of Eclipse from 
+							<ulink url="http://www.eclipse.org/downloads/">here</ulink>. AMP requires version 3.5.x (Gallieo) or higher. Version 3.6 (Hellos) which is currently a development (beta) release works well too. We recommend the "Classic" release at the bottom of the page as the other releases have a bunch of stuff you wont' need.
+						</para>
+					</listitem>
+					<listitem>
+						<para>Add update sites for AMP and AMP dependencies. See the screenshot below and the 
+							<ulink url="http://help.eclipse.org/galileo/topic/org.eclipse.platform.doc.user/tasks/tasks-124.htm">Eclipse Documentation</ulink>. There are different versions of the update sites, depending on whether you want to use the most stable version of the toolset or the "latest and greatest". The update sites are listed below.
+						</para>
+					</listitem>
+					<listitem>
+						<para>(Optional) If you install and AMP extensions, add Update Sites for them -- they're also listed below.</para>
+					</listitem>
+					<listitem>
+						<para>Select the features that you want to install.</para>
+					</listitem>
+					<listitem>
+						<para>Click the 
+							<emphasis role="bold">Next</emphasis> button, review the licenses, and then click 
+							<emphasis role="bold">Finish</emphasis>.
+						</para>
+					</listitem>
+				</orderedlist>
+				<para>Agent Modeling Platform update sites:</para>
+				<literallayout format="linespecific" class="normal">Milestones (recommended): http://download.eclipse.org/amp/updates/milestones
+Interim (newer): http://download.eclipse.org/amp/updates/interim
+Nightly (bleeding edge): http://download.eclipse.org/amp/updates/nightly
+</literallayout>
+				<para>Update sites for AMP Extensions</para>
+				<literallayout format="linespecific" class="normal">AGF 3D (recommended): http://lwjgl.org/update
+AMF for Ascape (recommended for Java developers): http://ascape.sourceforge.net/eclipse
+AMF for Repast (for people using Repast): http://mirror.anl.gov/pub/repastsimphony/site.xml (non P2)
+</literallayout>
+				<para>In the following screenshot, we've added the LWJGL site (not shown) as well as the Ascape site (not shown), but not the Repast site, and we're about to install the respective features. </para>
+				<para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/resources/AMPUpdateSite.png" scale="50"/>
+						</imageobject>
+					</mediaobject>
+				</para>
+				<para>Once you've done that, select the 
+					<emphasis role="bold">Help &gt; Help Contents</emphasis> menu, find the Agent Modeling Guide and open this overview page within that guide.
+				</para>
+			</section>
+			<section id="Extensions">
+				<title>Extensions</title>
+				<section id="Ascape">
+					<title>Ascape</title>
+					<para>For licensing and copyright reasons we can't provide all of the Ascape tools and manual on the Eclipse hosted Agent Modeling Project site. None of these tools are necessary to use AMP (the core Ascape support is an IP approved part of the AMP distribution) but they're highly recommended. The Ascape tools include:</para>
+					<orderedlist inheritnum="ignore" continuation="restarts">
+						<listitem>
+							<para>An excellent Manual covering programming Java models in Ascape and Escape. (The API is the same.)</para>
+						</listitem>
+						<listitem>
+							<para>Support for creating Ascape Java projects and executing the Swing-based Java Applications. Swing deployed Ascape Java Applications can be as small as 10MB and can be deployed to the web.</para>
+						</listitem>
+						<listitem>
+							<para>Eclipse based IDE support for plain Java Ascape projects.</para>
+						</listitem>
+					</orderedlist>
+					<para>The Ascape update site is at:</para>
+					<literallayout format="linespecific" class="normal">http://ascape.sourceforge.net/eclipse
+</literallayout>
+					<para>To install Ascape, use the update manager. Select 
+						<emphasis role="bold">Help &gt; Install New Software..."</emphasis>, add the Ascape update site, select the Ascape category and click the 
+						<emphasis role="bold">Finish</emphasis> button.
+					</para>
+					<para>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/resources/AscapeUpdateSite.png" scale="50"/>
+							</imageobject>
+						</mediaobject>
+					</para>
+				</section>
+				<section id="Repast">
+					<title>Repast</title>
+					<para>The Repast update site is at:</para>
+					<literallayout format="linespecific" class="normal">http://mirror.anl.gov/pub/repastsimphony/site.xml
+</literallayout>
+					<para>More information on downloading and installing repast can be found 
+						<ulink url="http://repast.sourceforge.net/docs/development.html">here</ulink>. Follow the instrucitons for "Configuration B".
+					</para>
+				</section>
+			</section>
+		</section>
+		<section id="Models">
+			<title>Models</title>
+			<section id="Obtaining_Example_Models">
+				<title>Obtaining Example Models</title>
+				<para>There is a cheat-sheet available for obtaining the example models. If you would rather obtain them yourself, here is the CVS information:</para>
+				<section id="Team_Project_Sets">
+					<title>Team Project Sets</title>
+					<para>You can use the following team project sets. See 
+						<ulink url="http://help.eclipse.org/galileo/topic/org.eclipse.platform.doc.user/tasks/tasks-cvs-project-set.htm">this document</ulink> for more information about using project sets.
+					</para>
+					<literallayout format="linespecific" class="normal">http://eclipse.org/amp/project-sets/ascape.psf
+http://eclipse.org/amp/project-sets/escapeAMFExamples.psf
+</literallayout>
+				</section>
+				<section id="From_Version_Control_Systems">
+					<title>From Version Control Systems</title>
+					<para>Import the CVS projects from the AMP project repository. For help, see 
+						<ulink url="http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/reference/ref-40a.htm">this page</ulink>. Here are the details for CVS Access:
+					</para>
+					<para>CVS Repository:</para>
+					<literallayout format="linespecific" class="normal">Connection type:	pserver
+User:	anonymous
+Password:	[none]
+Host:	dev.eclipse.org
+Path:	/cvsroot/modeling
+Module:	/org.eclipse.amp
+</literallayout>
+					<para>AMF Escape Models:</para>
+					<literallayout format="linespecific" class="normal">org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape 
+</literallayout>
+					<para>AMF Ascape and Repast Models:</para>
+					<literallayout format="linespecific" class="normal">org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape 
+org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast 
+</literallayout>
+					<para>The Ascape example projects are available at the Sourceforge SVN server. You can get them at the following locations. See the 
+						<ulink url="/wiki/http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php_Subversive_User_Guide">http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php Subversive User Guide</ulink> for more information about using SVN. (You'll need to install Subversion if you don't already have it.)
+					</para>
+					<para>Escape Java Models:</para>
+					<literallayout format="linespecific" class="normal">https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.models.brook
+https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.models.examples
+</literallayout>
+					<para>Ascape (Swing-based) Java Models:</para>
+					<literallayout format="linespecific" class="normal">https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.examples
+https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.brook
+</literallayout>
+				</section>
 			</section>
 		</section>
 	</chapter>
 	<chapter id="Resources">
 		<title>Resources</title>
-		<section id="Obtaining_Example_Models">
-			<title>Obtaining Example Models</title>
-			<para>There is a cheat-sheet available for obtaining the example models. If you would rather obtain them yourself, here is the CVS information:</para>
-			<section id="Import_from_CVS">
-				<section>
-					<title>Import from CVS</title>
-					<itemizedlist>
-						<listitem>
-							<para>Import the CVS projects from the AMP project repository. For help, see 
-								<ulink url="http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/reference/ref-40a.htm">this page</ulink>. For repository details, see 
-								<ulink url="http://eclipse.org/amp/developers/repositoryDetails.php">http://eclipse.org/amp/developers/repositoryDetails.php</ulink>. These are the example projects:
-							</para>
-						</listitem>
-					</itemizedlist>
-					<literallayout format="linespecific" class="normal">org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape 
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape 
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast 
-</literallayout>
-					<itemizedlist>
-						<listitem>
-							<para>Right-click on the models to execute them.</para>
-						</listitem>
-						<listitem>
-							<para>Play around with the model attribute settings and behavior (Acts).</para>
-						</listitem>
-					</itemizedlist>
-				</section>
-			</section>
-		</section>
 		<section id="Websites">
 			<title>Websites</title>
 			<para>
@@ -3318,7 +3485,7 @@
 			<section id="General_Support.2C_Questions_and_Discussion">
 				<title>General Support, Questions and Discussion</title>
 				<para>The 
-					<ulink url="http://www.eclipse.org/forums/index.php?t=thread&amp;frm_id=17&amp;S=f4fa6cb31327772a3b626dc409db409b">Agent Modeling Platform Newsgroup</ulink> is the place to discuss or get support for any of the Eclipse AMP tools. 
+					<ulink url="http://www.eclipse.org/forums/index.php?t=thread&amp;frm_id=17&amp;S=f4fa6cb31327772a3b626dc409db409b">Agent Modeling Platform Newsgroup</ulink> is the place to discuss or get support for any of the Eclipse AMP tools. Don't hesitate to ask questions about model implementation or bring up more general topics for discussion.
 				</para>
 			</section>
 			<section id="View_Existing_Bugs_and_Feature_Requests">
@@ -3341,6 +3508,9 @@
 					<ulink url="https://dev.eclipse.org/mailman/listinfo/amp-dev">https://dev.eclipse.org/mailman/listinfo/amp-dev</ulink>.
 				</para>
 			</section>
+		</section>
+		<section id="Other_Contacts">
+			<title>Other Contacts</title>
 			<section id="Professional_Support">
 				<title>Professional Support</title>
 				<para>The AMP project developers -- among the most experienced developers of agent models and tools anywhere -- are naturally the best source for Agent Modeling development, support and training. Please feel free to contact the project lead or other project contributors directly to discuss professional support options.</para>
@@ -3350,10 +3520,6 @@
 				<para>For project related but non-public communications such as media enquires or potential project sponsorship, please contact Miles Parker, the Eclipse AMP project lead, at amp_enquiry@metascapeabm.com. (Requests for support and other communications to this address will be ignored.)</para>
 			</section>
 		</section>
-		<section id="Feedback">
-			<title>Feedback</title>
-			<para>If you have ideas, comments or requests for information about the project please contact us at the .</para>
-		</section>
 		<section id="Get_Involved">
 			<title>Get Involved</title>
 			<para>If you find this tool valuable, please be aware that most of its development occurred through volunteer contributions from individuals and companies that have received no direct funding. You can support continual development efforts financially by purchasing related software tools from companies and organizations that help develop it, including funding for developer time in grant proposals. You can support the Eclipse platform in general by becoming a member organization of Eclipse. But the most important thing that you can contribute is your own time and enthusiasm, either through directly contributing to AMP or by promoting its use in blogs and other social media. For more detailed information about contributing to AMP, please see 
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/cheatsheets/CreateEscapeJavaModel.xml b/org.eclipse.amp/doc/org.eclipse.amp.doc/cheatsheets/CreateEscapeJavaModel.xml
index 67e7ad4..90fbdce 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/cheatsheets/CreateEscapeJavaModel.xml
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/cheatsheets/CreateEscapeJavaModel.xml
@@ -18,7 +18,7 @@
    <item
          title="Copy the Coordination Game code.">
       <description>
-         To implement the model, we'll just copy the code from the Ascape manual.
+         To implement the model, we&apos;ll just copy the code from the Ascape manual. If you don&apos;t have the Ascape documentation installed you can find the code at: http://ascape.sourceforge.net/manual/Appendix.html#1.
       </description>
       <command
             required="false"
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/cheatsheets/RunEscape.xml b/org.eclipse.amp/doc/org.eclipse.amp.doc/cheatsheets/RunEscape.xml
index de14e6c..85f6525 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/cheatsheets/RunEscape.xml
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/cheatsheets/RunEscape.xml
@@ -70,7 +70,10 @@
             serialization="org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.amp.view.customizer.Chart)"/>
    </item>
    <item
-      If the model developer has provided an &quot;About[model].html&quot; file in the project &apos;res&apos; directory, you&apos;ll be able to find out more about the model by looking at the &quot;About Model&quot; view.;ll be able to find out more about the model by looking at the &quot;About Model&quot; view.
+         skip="true"
+         title="Find out more about the model">
+      <description>
+         If the model developer has provided an &quot;About[model].html&quot; file in a &quot;res&quot; directory, you;ll be able to find out more about the model by looking at the &quot;About Model&quot; view.
       </description>
       <command
             required="false"
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/customBuild.xml b/org.eclipse.amp/doc/org.eclipse.amp.doc/customBuild.xml
index bc001bc..c4e5c72 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/customBuild.xml
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/customBuild.xml
@@ -4,11 +4,13 @@
     (c) Lawrence Mandel <lmandel@ca.ibm.com>
     (c) Peter Friese <peter.friese@itemis.com>
 -->
-<project name="org.eclipse.amp.doc" default="build-and-deploy-doc" basedir=".">
+<project name="org.eclipse.amp.doc" default="build-doc" basedir=".">
 
 	<!--
 		Global vars
 	-->
+	<property name="fs" value="${file.separator}" />
+	
 	<property name="document.name" value="amp" />
 	<property name="document.stylesheet" value="styles/html.xsl" />
 	<property name="dbpdf.stylesheet" value="styles/dbpdfdb.xsl" />
@@ -19,20 +21,19 @@
 	<property name="html-css.file" value="styles/book.css" />
 
 	<property name="build.dir" value="build" />
-	<property name="download.dir" value="${java.io.tmpdir}${file.separator}downloads" />
+	<property name="download.dir" value="${java.io.tmpdir}${fs}downloads" />
+	<!-- Changed from XText version to write directly to the web dir..saves on cvs thrashing.. -->
 	<property name="website.dir" value="../../../amp" />
+	<property name="website.doc.dir" value="${website.dir}${fs}documentation" />
+	<property name="website.content.dir" value="${website.doc.dir}${fs}contents" />
 
-	<!--  
-		WikiText Toolchain 
-	<property name="wikitext.url" value="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/tools/mylyn/update/weekly/mylyn-wikitext-standalone-latest.zip"/>
-	-->
 	<property name="wikitext.url" value="http://download.eclipse.org/tools/mylyn/update/weekly/mylyn-wikitext-standalone-latest.zip" />
-	<property name="wikitext.dir" value="${download.dir}${file.separator}wikitext" />
+	<property name="wikitext.dir" value="${download.dir}${fs}wikitext" />
 
 	<target name="check-wikitext">
 		<condition property="hasWikiText">
 			<and>
-				<available file="${download.dir}${file.separator}wikitext.zip" property="hasWikiTextZIP" />
+				<available file="${download.dir}${fs}wikitext.zip" property="hasWikiTextZIP" />
 				<available file="${wikitext.dir}" property="hasWikiTextDir" />
 			</and>
 		</condition>
@@ -40,8 +41,8 @@
 
 	<target name="get-wikitext" description="Downloads WikiText" depends="check-wikitext" unless="hasWikiText">
 		<echo>Downloading WikiText...</echo>
-		<get dest="${download.dir}${file.separator}wikitext.zip" src="${wikitext.url}" />
-		<unzip src="${download.dir}${file.separator}wikitext.zip" dest="${wikitext.dir}">
+		<get dest="${download.dir}${fs}wikitext.zip" src="${wikitext.url}" />
+		<unzip src="${download.dir}${fs}wikitext.zip" dest="${wikitext.dir}">
 			<patternset includes="**/*.jar" />
 			<mapper type="flatten" />
 		</unzip>
@@ -65,7 +66,7 @@
 				</tokenfilter>
 			</filterchain>
 		</loadfile>
-		<concat destfile="${build.dir}${file.separator}${document.name}.mediawiki" append="false" fixlastline="yes">
+		<concat destfile="${build.dir}${fs}${document.name}.mediawiki" append="false" fixlastline="yes">
 			<filelist dir="doc" files="${inputfiles}" />
 		</concat>
 	</target>
@@ -83,9 +84,9 @@
 	-->
 	<!-- <property name="docbook.version" value="1.73.2" /> -->
 	<property name="docbook.version" value="1.75.1" />
-	<property name="docbook.dir" value="${download.dir}${file.separator}docbook-xsl-${docbook.version}" />
+	<property name="docbook.dir" value="${download.dir}${fs}docbook-xsl-${docbook.version}" />
 	<property name="docbookxsl.url" value="http://internap.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-${docbook.version}.zip" />
-	<property name="fop.dir" value="${download.dir}${file.separator}fop-0.95" />
+	<property name="fop.dir" value="${download.dir}${fs}fop-0.95" />
 	<property name="fop.url" value="http://mirrorspace.org/apache/xmlgraphics/fop/binaries/fop-0.95-bin.zip" />
 	<property name="jai.dir" value="ENTER_JAI_DIRECTORY" />
 
@@ -95,14 +96,14 @@
 		<sequential>
 			<taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop">
 				<classpath>
-					<pathelement location="${fop.dir}${file.separator}build${file.separator}fop.jar" />
-					<pathelement location="${fop.dir}${file.separator}lib${file.separator}avalon-framework-4.2.0.jar" />
-					<pathelement location="${fop.dir}${file.separator}lib${file.separator}commons-logging-1.0.4.jar" />
-					<pathelement location="${fop.dir}${file.separator}lib${file.separator}commons-io-1.3.1.jar" />
-					<pathelement location="${fop.dir}${file.separator}lib${file.separator}batik-all-1.7.jar" />
-					<pathelement location="${fop.dir}${file.separator}lib${file.separator}xmlgraphics-commons-1.3.1.jar" />
-					<pathelement location="${jai.dir}${file.separator}lib${file.separator}jai_core.jar" />
-					<pathelement location="${jai.dir}${file.separator}lib${file.separator}jai_codec.jar" />
+					<pathelement location="${fop.dir}${fs}build${fs}fop.jar" />
+					<pathelement location="${fop.dir}${fs}lib${fs}avalon-framework-4.2.0.jar" />
+					<pathelement location="${fop.dir}${fs}lib${fs}commons-logging-1.0.4.jar" />
+					<pathelement location="${fop.dir}${fs}lib${fs}commons-io-1.3.1.jar" />
+					<pathelement location="${fop.dir}${fs}lib${fs}batik-all-1.7.jar" />
+					<pathelement location="${fop.dir}${fs}lib${fs}xmlgraphics-commons-1.3.1.jar" />
+					<pathelement location="${jai.dir}${fs}lib${fs}jai_core.jar" />
+					<pathelement location="${jai.dir}${fs}lib${fs}jai_codec.jar" />
 				</classpath>
 			</taskdef>
 			<fop format="application/pdf" fofile="@{source}" outfile="@{target}" messagelevel="info" />
@@ -114,19 +115,6 @@
 		<mkdir dir="${build.dir}" />
 	</target>
 
-	<target name="deploy-doc">
-		<copy todir="${website.dir}/documentation/contents" overwrite="true">
-			<fileset dir="html/">
-				<include name="**" />
-			</fileset>
-		</copy>
-		<copy todir="${website.dir}/documentation" overwrite="true">
-			<fileset dir="manual/">
-				<include name="**" />
-			</fileset>
-		</copy>
-	</target>
-
 	<target name="build-doc" depends="init, install-wikitext, get-docbook-xsl, get-fop">
 		<echo>Building Output...</echo>
 		<antcall target="wikitext2docbook" />
@@ -138,13 +126,10 @@
 		<antcall target="docbook2eclipsehelp" />
 	</target>
 
-	<target name="build-and-deploy-doc" depends="build-doc, deploy-doc">
-	</target>
-
 	<target name="check-docbook">
 		<condition property="hasDocbook">
 			<and>
-				<available file="${download.dir}${file.separator}docbook.zip" property="hasDocbookZip" />
+				<available file="${download.dir}${fs}docbook.zip" property="hasDocbookZip" />
 				<available file="${docbook.dir}" type="dir" property="hasDocbookDir" />
 			</and>
 		</condition>
@@ -153,7 +138,7 @@
 	<target name="check-fop">
 		<condition property="hasFOP">
 			<and>
-				<available file="${download.dir}${file.separator}fop.zip" property="hasFOPZip" />
+				<available file="${download.dir}${fs}fop.zip" property="hasFOPZip" />
 				<available file="${fop.dir}" type="dir" property="hasFOPDir" />
 			</and>
 		</condition>
@@ -161,33 +146,33 @@
 
 	<target name="get-docbook-xsl" description="Downloads docbook xsl" depends="check-docbook" unless="hasDocbook">
 		<echo>Downloading DocBook XSL...</echo>
-		<get dest="${download.dir}${file.separator}docbook.zip" src="${docbookxsl.url}" />
-		<unzip src="${download.dir}${file.separator}docbook.zip" dest="${download.dir}" />
+		<get dest="${download.dir}${fs}docbook.zip" src="${docbookxsl.url}" />
+		<unzip src="${download.dir}${fs}docbook.zip" dest="${download.dir}" />
 	</target>
 
 	<target name="get-fop" description="Downloads FOP" depends="check-fop" unless="hasFOP">
 		<echo>Downloading FOP...</echo>
-		<get dest="${download.dir}${file.separator}fop.zip" src="${fop.url}" />
-		<unzip src="${download.dir}${file.separator}fop.zip" dest="${download.dir}" />
+		<get dest="${download.dir}${fs}fop.zip" src="${fop.url}" />
+		<unzip src="${download.dir}${fs}fop.zip" dest="${download.dir}" />
 	</target>
 
 	<target name="docbook2html">
 		<echo>Converting article to HTML...</echo>
 		<delete dir="${basedir}/html" failonerror="false" excludes="CVS" includeemptydirs="true" />
 
-		<copy todir="${basedir}/html">
+		<copy todir="${website.content.dir}">
 			<fileset dir="doc/">
 				<include name="images/**" />
 			</fileset>
 		</copy>
-		<copy file="${html-css.file}" todir="${basedir}/html" />
+		<copy file="${html-css.file}" todir="${website.content.dir}" />
 
-		<xslt in="${build.dir}${file.separator}${document.name}.xml" extension="xml" out="${basedir}/html${file.separator}${document.name}.html" style="${document.stylesheet}">
+		<xslt in="${build.dir}${fs}${document.name}.xml" extension="xml" out="${website.content.dir}${fs}${document.name}.html" style="${document.stylesheet}">
 			<factory name="org.apache.xalan.processor.TransformerFactoryImpl">
 				<attribute name="http://xml.apache.org/xalan/features/optimize" value="true" />
 			</factory>
 			<xmlcatalog>
-				<entity publicId="docbook.xsl" location="${docbook.dir}${file.separator}html${file.separator}docbook.xsl" />
+				<entity publicId="docbook.xsl" location="${docbook.dir}${fs}html${fs}docbook.xsl" />
 			</xmlcatalog>
 			<param name="header.rule" expression="1" />
 			<param name="admon.graphics.extension" expression=".gif" />
@@ -199,9 +184,8 @@
 
 	<target name="docbook2pdf">
 		<echo>Converting article to PDF...</echo>
-		<delete file="manual${file.separator}${document.name}.pdf" failonerror="false" />
-		<delete file="${build.dir}${file.separator}${document.name}.fo" />
-		<mkdir dir="manual" />
+		<delete file="${website.doc.dir}${fs}${document.name}.pdf" failonerror="false" />
+		<delete file="${build.dir}${fs}${document.name}.fo" />
 
 		<!-- HACK! images should rather be copied to build/images -->
 		<copy todir="${basedir}">
@@ -211,21 +195,21 @@
 		</copy>
 
 
-		<xslt in="${build.dir}${file.separator}${document.name}.xml" extension="xml" out="${build.dir}${file.separator}${document.name}PDF.xml" style="${dbpdf.stylesheet}">
+		<xslt in="${build.dir}${fs}${document.name}.xml" extension="xml" out="${build.dir}${fs}${document.name}PDF.xml" style="${dbpdf.stylesheet}">
 			<factory name="org.apache.xalan.processor.TransformerFactoryImpl">
 				<attribute name="http://xml.apache.org/xalan/features/optimize" value="true" />
 			</factory>
 			<xmlcatalog>
-				<entity publicId="docbook.xsl" location="${docbook.dir}${file.separator}fo${file.separator}docbook.xsl" />
+				<entity publicId="docbook.xsl" location="${docbook.dir}${fs}fo${fs}docbook.xsl" />
 			</xmlcatalog>
 		</xslt>
 
-		<xslt in="${build.dir}${file.separator}${document.name}PDF.xml" extension="xml" out="${build.dir}${file.separator}${document.name}.fo" style="${document.pdf.stylesheet}">
+		<xslt in="${build.dir}${fs}${document.name}PDF.xml" extension="xml" out="${build.dir}${fs}${document.name}.fo" style="${document.pdf.stylesheet}">
 			<factory name="org.apache.xalan.processor.TransformerFactoryImpl">
 				<attribute name="http://xml.apache.org/xalan/features/optimize" value="true" />
 			</factory>
 			<xmlcatalog>
-				<entity publicId="docbook.xsl" location="${docbook.dir}${file.separator}fo${file.separator}docbook.xsl" />
+				<entity publicId="docbook.xsl" location="${docbook.dir}${fs}fo${fs}docbook.xsl" />
 			</xmlcatalog>
 			<param name="graphicsize.extension" expression="1" />
 			<param name="use.extensions" expression="1" />
@@ -238,11 +222,11 @@
 			<param name="scale" expression="10" />
 		</xslt>
 
-		<docbook2pdf source="${build.dir}${file.separator}${document.name}.fo" target="manual${file.separator}${document.name}.pdf" />
+		<docbook2pdf source="${build.dir}${fs}${document.name}.fo" target="${website.doc.dir}${fs}${document.name}.pdf" />
 
 		<!-- Remove the resulting formatting object. This object isn't necessary in the
 		     result of this build. -->
-		<delete file="${build.dir}${file.separator}${document.name}.fo" />
+		<delete file="${build.dir}${fs}${document.name}.fo" />
 		<delete dir="${basedir}/images" />
 	</target>
 
@@ -273,7 +257,7 @@
 				<attribute name="http://xml.apache.org/xalan/features/optimize" value="true" />
 			</factory>
 			<xmlcatalog>
-				<entity publicId="chunk.xsl" location="${docbook.dir}${file.separator}html${file.separator}chunk.xsl" />
+				<entity publicId="chunk.xsl" location="${docbook.dir}${fs}html${fs}chunk.xsl" />
 			</xmlcatalog>
 			<param name="header.rule" expression="1" />
 			<param name="ignore.image.scaling" expression="1" />
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/012-QuickStart.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/012-QuickStart.mediawiki
new file mode 100644
index 0000000..87591c4
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/012-QuickStart.mediawiki
@@ -0,0 +1,40 @@
+==Quick Start==
+
+If you're the kind of person who likes to jump right in, here are the basics.
+
+===Install===
+
+If you're using a complete IDE, or have already installed AMP from the Eclipse update sites, you can ignore this step. Otherwise, refer to the Installation Guide at the end of this manual.
+
+===Welcome!===
+
+When you first run the tools, you will see a welcome screen. If the screen isn't showing, select the '''Help > Welcome''' menu. Click on the "Overview", "Samples" or "Tutorials" buttons to begin your exploration.
+
+===Cheat!===
+
+The Agent Modeling tools come with a number of "Cheat Sheets" to help get you started. You can access them by selecting '''Help > Cheat Sheets...'''. Then under the "Agent Modeling" category, select a cheat sheet, such as "Load Sample Projects".
+
+===Follow the Tutorial===
+
+The tools also come with extensive tutorials. See the "Tutorials" section for more help on that.
+
+===Follow your Interest===
+
+AMP has many potential facets and use cases. Check out the following sections of the manual for more information about..
+
+====ABM Researchers====
+
+Run an example model using the "Run an Example Model" cheat sheet.
+
+====ABM Modelers====
+
+Create Agent-Based models using simple visual tools and deploy them to a number of popular ABM platforms, including Escape. Follow the tutorial section of the Modeler's guide.
+
+====ABM Java Developers====
+
+Write "Plain Old Java" models within a full-featured agent-based modeling framework. Read Programmers Guide and then try the "Create an Escape Java Model" cheat sheet.
+
+====Eclipse Plugin Developers====
+
+AXF and AGF provide a number of features based around Eclipse technologies such as GEF, GEF3D, BIRT Charts and Zest. For example, AGF supports dynamic visualization of objects in space, and AXF supports managed UI and headless execution for models of any kind. There isn't currently any general documentation for these features, but we encourage you to look at the APIs and at Escape's implementation of them. They're straightforward and can be useful for a variety of general science platform needs.
+
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/015-Guide_ABM.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/015-Guide_ABM.mediawiki
index 5715dda..589f249 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/015-Guide_ABM.mediawiki
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/015-Guide_ABM.mediawiki
@@ -19,6 +19,31 @@
 
 Agent-Based Models (ABMs) seek to represent important real-world dynamics by designing communities of software agents that mimic real entities. Rather than make simplifying assumptions about such systems and then representing them in equation form or as off the shelf algorithmic constructs, the ABM researcher aims to identify key agent state, interaction spaces, and behaviors. Agents are then "let loose" on our computers and we explore what happens next. The computational horsepower exists today to simulate large numbers (e.g. >>10) of interacting, adaptive and autonomous agents but often desktop computers are all we need to explore significant domains. ABMs have been designed to represent all kinds of important natural systems, at scales reaching from cellular mechanics to international trade and are being used to solve truly hard problems in government, business, and academia. ABMs are not a solution to every problem, but they can help us to appreciate and gain unique insight into many systems, and often they can help us to come up with better practical decisions than we might using classic approaches.
 
-==Other Uses==
+==Other Domains==
 
 Many kinds of objects share characteristics of ABM agents -- after all, software agents are used in many other contexts. The Agent Modeling Framework meta-modeling support is potentially suitable (or extendible) for a number of approaches outside of ABM; for example business rules, object interactions, systems dynamics models and traditional discrete event models. Similarly, AMP execution and graphic support can be used for modeling natural systems but could also be used to manage other software agents -- for example independent reasoning tasks or dynamic visualization support.
+
+==The Agent Modeling Platform (AMP)==
+
+The Eclipse Agent Modeling Project (Incubation) or "AMP" provides the core support for both open source and commercial modeling tools. AMP in turn is built upon Elipse, the most powerful, well-supported and popular Integrated Development Platform (IDE) available anywhere.
+
+AMP provides extensible frameworks and exemplary tools for representing, editing, generating, executing and visualizing ABMs and any other domain requiring spatial, behavioral and functional features. AMP has two main themes that complement but don't depend on one another, modeling of agent systems (AMF) and execution and exploration of those systems (AXF, AGF and Escape).
+
+The overall AMP architecture and project dependencies are summarized in the architectural diagram below:
+
+[[Image:images/AMPArchitectureDiagram.jpg]]
+
+===Agent Modeling Framework (AMF)===
+
+AMF provides an ABM meta-model representation, editor, generator and development environment. The AMF Acore meta-model is similar to EMF Ecore and defined in Ecore, but provides high-level support for complex agents.AMF generates complete executable models for Escape, Ascape and Repast Simphony, as well as Java Skeletons and Interfaces, JUnit test cases and documentation and is easily extensible to support additional targets. For more on AMF, see the Modeler Guide.
+
+===Agent Execution Framework (AXF)===
+The execution framework provides services and UI for model management, execution, and views. Arbitrary toolkits can easily integrate with Eclipse and AXF by implementing pluggable providers like engines, agents and view parts. AXF is not just for ABM -- anyone who needs support for executing, managing and visualizing collections of objects may find it useful. AXF user tools are covered extensively in the User Guide, and the forthcoming Platform Developers Guide will provide information about integrating AXF in your own tools.
+
+===Agent Graphics Framework (AGF)===
+
+The graphics framework extends GEF, GEF3D, Zest, and the BIRT charting engine to support real-time visualization of and interaction with agent models. AGF currently provides support for 2D, 2 1/2 D. and graph structures, and will be extended to 3-D, GIS and others. As with other AMP components, the AGF design focus is to provide an extensible infrastructure so that platform adopters can easily create their own view and editor parts. AGF user tools are covered extensively in the User Guide, and the forthcoming Platform Developers Guide will provide information about integrating and extending AGF in your own tools.
+
+===Escape===
+
+Escape is an exemplar ABM toolset. It's based on Ascape, which has been in use for more than 10 years. The core API is very stable, and that should give users a way to explore the features of AMP without concerns about keeping in synch with the rapidly evolving AXF /AGF API. It allows modelers to code in Java and/or generate models with AMF and then execute those models within the same development environment. Escape is the primary target for most of the models in this guide. Those users interested in writing code directly to the Escape API can refer to the Programmer Guide.
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/050-AMP_Overview.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/050-AMP_Overview.mediawiki
deleted file mode 100644
index 487e692..0000000
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/050-AMP_Overview.mediawiki
+++ /dev/null
@@ -1,23 +0,0 @@
-==The Agent Modeling Platform (AMP)==
-
-The Eclipse Agent Modeling Project (Incubation) or "AMP" provides extensible frameworks and exemplary tools for representing, editing, generating,
-executing and visualizing agent-based models (ABMs) and any other domain requiring spatial, behavioral and functional features. AMP has two main themes that complement but don't depend on one another, modeling of agent systems (AMF) and execution and exploration of those systems (AXF, AGF and Escape).
-
-The overall AMP architecture and project dependencies are summarized in the architectural diagram below:
-
-[[Image:images/AMPArchitectureDiagram.jpg]]
-
-===Agent Modeling Framework (AMF)===
-
-AMF provides an ABM meta-model representation, editor, generator and development environment. The AMF Acore meta-model is similar to EMF Ecore and defined in Ecore, but provides high-level support for complex agents.AMF generates complete executable models for Escape, Ascape and Repast Simphony, as well as Java Skeletons and Interfaces, JUnit test cases and documentation and is easily extensible to support additional targets. For more on AMF, see the Modeler Guide.
-
-===Agent Execution Framework (AXF)===
-The execution framework provides services and UI for model management, execution, and views. Arbitrary toolkits can easily integrate with Eclipse and AXF by implementing pluggable providers like engines, agents and view parts. AXF is not just for ABM -- anyone who needs support for executing, managing and visualizing collections of objects may find it useful. AXF user tools are covered extensively in the User Guide, and the forthcoming Platform Developers Guide will provide information about integrating AXF in your own tools.
-
-===Agent Graphics Framework (AGF)===
-
-The graphics framework extends GEF, GEF3D, Zest, and the BIRT charting engine to support real-time visualization of and interaction with agent models. AGF currently provides support for 2D, 2 1/2 D. and graph structures, and will be extended to 3-D, GIS and others. As with other AMP components, the AGF design focus is to provide an extensible infrastructure so that platform adopters can easily create their own view and editor parts. AGF user tools are covered extensively in the User Guide, and the forthcoming Platform Developers Guide will provide information about integrating and extending AGF in your own tools.
-
-===Escape===
-
-Escape is an exemplar ABM toolset. It's based on Ascape, which has been in use for more than 10 years. The core API is very stable, and that should give users a way to explore the features of AMP without concerns about keeping in synch with the rapidly evolving AXF /AGF API. It allows modelers to code in Java and/or generate models with AMF and then execute those models within the same development environment. Escape is the primary target for most of the models in this guide. Those users interested in writing code directly to the Escape API can refer to the Programmer Guide.
\ No newline at end of file
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/060-GettingStarted.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/060-GettingStarted.mediawiki
deleted file mode 100644
index 48e384e..0000000
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/060-GettingStarted.mediawiki
+++ /dev/null
@@ -1,33 +0,0 @@
-
-==Getting Started==
-
-AMP has many potential facets and use cases.
-
-===Setting up Eclipse===
-
-If you're reading this from the Eclipse help browser, you've already done this! Otherwise, if you aren't using a full download version of AMP, you'll need to [http://eclipse.org/amp/installing/ install it]. Once you've done that, select the '''Help > Help Contents''' menu, find the Agent Modeling Guide and open this overview page within that guide.
-
-Some installations will also include a Welcome screen which will guide you through the same set of steps.
-
-===Get the Example Projects===
-
-You can do that using a cheat sheet. Select '''Help > Cheat Sheets...''' and then under the "Agent Modeling" category, select "Load Sample Projects".
-
-Then check out the following sections of the manual for more information about..
-
-===ABM Researchers===
-
-Run an example model using the "Run an Example Model" cheat sheet.
-
-===ABM Modelers===
-
-Create Agent-Based models using simple visual tools and deploy them to a number of popular ABM platforms, including Escape. Follow the tutorial section of the Modeler's guide.
-
-===ABM Java Developers===
-
-Write "Plain Old Java" models within a full-featured agent-based modeling framework. Read Programmers Guide and then try the "Create an Escape Java Model" cheat sheet.
-
-===Eclipse Plugin Developers===
-
-AXF and AGF provide a number of features based around Eclipse technologies such as GEF, GEF3D, BIRT Charts and Zest. For example, AGF supports dynamic visualization of objects in space, and AXF supports managed UI and headless execution for models of any kind. There isn't currently any general documentation for these features, but we encourage you to look at the APIs and at Escape's implementation of them. They're straightforward and can be useful for a variety of general science platform needs.
-
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/110-ModelerGuide_Structure.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/110-ModelerGuide_Structure.mediawiki
index bd32bae..a66d910 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/110-ModelerGuide_Structure.mediawiki
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/110-ModelerGuide_Structure.mediawiki
@@ -71,19 +71,14 @@
 
 These can be anyone of the following: 
 
-{| cellpadding=="10" cellspacing=="0" border=="1"
-|Boolean
-|A value that is simply true or false. Note that unless this value really is a simple binary value, you should consider using state instead. (See details below.) For example, rather than representing gender as a 'Female' boolean value, define a 'Gender' state with values 'Male' and "Female'. Generated artifacts and documentation will be much clearer, and you'll be able to easily modify the model later if for example you discover that there are more than two potential gender categories that are relevant to your model.
-|-
-|Integer
-|A discrete whole number value, such as "100", "-1", "10029920". It's generally a good idea to represent any value that can never have a decimal value as an integer.
-|-
-|Real
-|A continuous number value. While these are typically represented in software as floating point numbers, they can conceivably represent numbers at any arbitrary precision and in any scheme. Note that while technically speaking we should be representing irrational numbers, this is not currently supported for default values and users should simply use the closest decimal approximation.
-|-
-|Symbol
-|A string representing some state. More precisely, a computationally arbitrary value with contextual meaning. This could be any kind of identifier. For example, you might use it to store some kind of input coding from data that is then converted into an object state. Or it could simply be an agent's name. But theoretically (though this is not currently supported) one could imagine a symbol using an idiogram, an icon or even a sound that identifies or represents the agent in question.
-|}
+;'''Boolean'''
+: A value that is simply true or false. Note that unless this value really is a simple binary value, you should consider using state instead. (See details below.) For example, rather than representing gender as a 'Female' boolean value, define a 'Gender' state with values 'Male' and "Female'. Generated artifacts and documentation will be much clearer, and you'll be able to easily modify the model later if for example you discover that there are more than two potential gender categories that are relevant to your model.
+;'''Integer'''
+: A discrete whole number value, such as "100", "-1", "10029920". It's generally a good idea to represent any value that can never have a decimal value as an integer.
+;'''Real'''
+:A continuous number value. While these are typically represented in software as floating point numbers, they can conceivably represent numbers at any arbitrary precision and in any scheme. Note that while technically speaking we should be representing irrational numbers, this is not currently supported for default values and users should simply use the closest decimal approximation.
+;'''Symbol'''
+:A string representing some state. More precisely, a computationally arbitrary value with contextual meaning. This could be any kind of identifier. For example, you might use it to store some kind of input coding from data that is then converted into an object state. Or it could simply be an agent's name. But theoretically (though this is not currently supported) one could imagine a symbol using an idiogram, an icon or even a sound that identifies or represents the agent in question.
 
 (Undefined and Numeric types should not be used within a well-defined model.)
 
@@ -138,9 +133,9 @@
 
 A value representing what happens to an agent when that agent is asked to move beyond its extent.
 
-;Periodic
+;'''Periodic'''
 : When encountering an edge, the agent will treat the space as wrapping around to the other side of the space. For example, if the agent at location {1,2} (0-based) within a Moore space (see grid discussion below) of size {10,10} is asked to find some other agent within distance 3, the agent look in the square defined between {8,9} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge. You can imagine this as taking a piece of graph paper and connecting the opposite edges. You can't actually do that with paper, but if you could you would have a toroidal (donut) shape in three dimensions defining the shape in two.
-;APeriodic
+;'''APeriodic'''
 : When encountering an edge, the agent treats it as the edge of the space. For example, if the agent at location {1,2} is asked to find some other agent within distance 3, the agent look between {0,0} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge.
 
 The "Strict" and "Bouncy" values are obsolete and should not be used.
@@ -163,11 +158,11 @@
 
 This value determines what constitutes a region within a particular distance from the agent. The value for this is often critical in obtaining particular behavior from a model, and shouldn't be overlooked. There are three possible values:
 
-;Euclidean
+;'''Euclidean'''
 : The distance between any two cells is taken to be the "real" distance. For example, if an agent was within a chess board, and we wanted to find all agents within distance three of it, we could determine that by taking a string of length 3, tacking it to the center of the source square, and including all cells whose centers we can reach with the other string end. Note that although Euclidean space may seem the most reasonable neighborhood configuration to choose, this really isn't the case. Euclidean space is continuous whereas grid space is discrete, and mapping the two to each other can create unexpected issues. Still, this is a good choice for models representing notional real spaces.
-;Moore
+;'''Moore'''
 :Here, the distance between any two cells is defined by the number of edge ''or'' corner adjacent cells crossed to get between them. To continue the chess board analogy, this is the set of moves that a king can make. Note that this does not map well to real space at all, as a cell at distance 1 in a moore space is at distance sqrt(2) in "real" space.
-;Von-Neumann
+;'''Von-Neumann'''
 : Here, the distance between any two cells is defined by the number of edge adjacent cells crossed to get between them. This is the set of moves that a rook might make on a chess board -- if a rook could only move one square at a time. It is also often referred to as a Manhattan distance for the self-evident reason.
  
 =====Network=====
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/500-ProgrammerGuide_Escape.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/500-ProgrammerGuide_Escape.mediawiki
index e7660c3..d6a346a 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/500-ProgrammerGuide_Escape.mediawiki
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/500-ProgrammerGuide_Escape.mediawiki
@@ -8,24 +8,97 @@
 
 A primary purpose of the Escape project -- apart from the obvious goal of providing a nice Eclipse hosted ABM toolkit -- is to provide an exemplar to demonstrate how any arbitrary agent modeling framework can be integrated within the AMP environment. A cool aspect of this is that AMP has no dependencies on Escape, but also that the underlying ABM modeling framework for Escape has no dependencies on AMP -- instead Escape simply provides the runtime glue between AMP and the ABM framework. The underlying ABM framework uses the Ascape API, an API that first began development more than ten years ago and that has not been modified at all in order for it to work within the AMP environment.
 
-==Getting Started==
+==Documentation==
 
-===Documentation and other Resources===
+In addition to this documentation, there are a number of other resources available related to Escape development. Because it's API is based on Ascape, a lot of resources developed for Ascape are equally applicable to Ascape. The Ascape documentation is bundled with some distributions of the AMP tools, but if you are using the Eclipse AMP download, you can access it online or install it from the Ascape update site.
 
-Because it's API is based on Ascape, Escape is one component of AMP that already has extensive documentation. There is complete Javadoc as well as a manual and other web resources. See the [http://ascape.sourceforge.net Ascape Website] to locate these resources. There is a [http://ascape.sourceforge.net/docs/TheAscapeManual5.pdf full manual] for Ascape available on that site. Or, you can install the Ascape Manual into the eclipse help system by adding the following update site and selecting the "Documentations and Source Code" feature.
+===Online===
 
-http://ascape.sourceforge.net/eclipse
+There is a complete [http://ascape.sourceforge.net/api/index.html Javadoc] as well as an [http://ascape.sourceforge.net/docs/TheAscapeManual5.pdf excellent manual] and other web resources. See the [http://ascape.sourceforge.net Ascape Website] for general information.
 
-===Installation===
+===Update Site===
 
-Escape is [http://eclipse.org/amp/installing/ installed] by default with the other model components. If you want to do 3D (really 2 1/2) visualizations, you will want AGF3D and the LWJGL dependency. You can build from source but in that case you'l need to launch a self-hosted runtime, so it's best to simply install from the update site if you're not actually doing AMP development.
+Or, you can install the Ascape Manual into the eclipse help system by adding the following update site and selecting the "Documentations and Source Code" feature. See the Installation Guide for more information.
+
+ http://ascape.sourceforge.net/eclipse
+
+==Installation==
+
+See the Installation Guide for Detailed Information -- that all applies to general Escape usage as well.
+
+Note that there are no dependendencies on AMF, and therefore EMF or any other modeling technologies to do Java development for Escape or for running generated models within Escape. The deployment environment can be quite light-weight. Simply install the AXF, AGF, and AMP Escape features. You can build from source but in that case you'l need to launch a self-hosted runtime, so it's best to simply install from the update site if you're not actually doing AMP development.
+
+Escape is [http://eclipse.org/amp/installing/ installed] by default with the other model components. If you want to do 3D (really 2 1/2) visualizations, you will want AGF3D and the LWJGL dependency.
+
+==Example Java Models==
+
+===Exploring Example ABM Models===
+
+The first thing most people will want to do in AMP is to play with the example models. You can explore AMF models as well as some really interesting classic ABM models.
+
+====Installing Models====
+
+See the Installation Guide to find out how to get the example models.
+
+=====AMF Models=====
+
+All AMF models produce pure Java code so they can be used like any other Escape Java model.
+
+ org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape
+
+To understand the capabilities of AMF in producing other kinds of Java models, you might also want to try out running the same models automatically generated for Ascape or Repast. These are located at dev.eclipse.org in cvsroot/modeling:
+
+ org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape
+ org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast
+
+=====Classic Escape / Ascape Java Models=====
+
+Many models have been created using Ascape over the years, including all of the classic models created at Brookings and some other cool models such as Craig Reynold's Boids and a pretty cool little traffic model, and they've all been converted to run in Escape. They're in Java but you can execute and explore them in exactly the same way as the Epidemic model above. All of the Ascape example models have been converted (a straightforward process) from their intial Ascape incarnations. For licensing reasons (they're BSD, not EPL) we can't host them directly on the Eclipse site.  You can get the projects in two ways:
+
+Once you've downloaded the projects, open up the src folder and navigate to the Java files for the actual models. For example, to run Conway's Life, you'll want src/edu.brook.life.ConwayLife. Right-click on the Java file and select "Execute". There are many models to explore! (It's not always obvious which Java files are for models, so you may have to poke around a bit. We need to put together a catalog here. Another nice opportunity for user contributions.)
+ 
+These are SVN projects in the sourceforge SVN. For help, see [[http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php this page]].
+
+ http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.brook
+ http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.examples
+ 
+====Generating Models====
+
+And of course, you can always use the AMF tools to generate models and then customize them from there. See the following section on integrating AMF with Java for more on that. There are a number of models developed with AMF that can automatically generate example models to run in Escape. There are two ways to run the example models:
+
+=====Creating a New Escape Project=====
+
+The best option is to simply create a new Escape project and drag the models into it!
+
+#If you're not already there, open the Agent Modeling Perspective. Select Window > Open Perspective > Other.. and then Agent Modeling. (Or you can choose Window > Reset Perspective and the Agent Modeling perspective should appear in the Open Perspective list itself.)
+#Create the project where we'll place our model. Select File > New > Escape AMF Project. Give it a name like "escape.tutorial", then click Finish.
+#Finally grab the Epidemic.metaabm model at http://download.eclipse.org/amp/models/Epidemic.metaabm and drag it into the project. (Depending on your browser the file may load as text directly into your browser, in which case just right-click on the link and save it to a file.)
 
 ==Developing Models==
 
 The easiest way for Java developers to get started doing agent-based modeling in Eclipse is to begin to write programs using it. To develop new models, you can:
 
-# Create a new Escape project. The Escape projects are actually configured for AMF code generation so there are dependencies and builders in there that you don't need; you can remove all of the escape builders and any of the kitchen sink items. The "Create an Escape Java Model" cheat sheet will walk you through the process of creating a new Java based project and model.
-# Or for more experienced Eclipse users, you can simply to just create a new Plugin Project and add the necessary dependencies there. Have a look at the example escape project to see what you need. Note that you will likely need more dependencies then you need to simply build -- this is because the class loader uses the classes from the project path and so runtime classes have to be there as well. We may simply package an Eclipse runtime convenience plugin to gather these dependencies up a bit.
+===Cheatsheet===
 
-Then just create new Java classes for your root model scape and agents just as you would for an Ascape project.
+By far the simplest way to get started is with the cheatsheet. This walks you through the complete process of creating a Java based model. '''Help > Cheat Sheets...''' and then select "Create an Escape Java Model" from within the "Agent Modeling" category.
+
+===Steps===
+
+# Create a new Escape project. The Escape projects are actually configured for AMF code generation so there are dependencies and builders in there that you don't need; you can remove all of the escape builders and any of the kitchen sink items. The "Create an Escape Java Model" cheat sheet will walk you through the process of creating a new Java based project and model.
+# Or for more experienced Eclipse users, you can simply to just create a new Plug-in Project and add the necessary dependencies there. Have a look at the example escape project to see what you need. Note that you will likely need more dependencies then you need to simply build -- this is because the class loader uses the classes from the project path and so runtime classes have to be there as well. We may simply package an Eclipse runtime convenience plug-in to gather these dependencies up a bit. Then just create new Java classes for your root model scape and agents just as you would for an Ascape project.
+
+==Executing Models==
+
+See the User Guide Execution Section for information on launching and controling models.
+
+We have a complete cheat sheet supporting this tutorial. Simply go to '''Help > Cheat Sheets...''' and then select "Run an Example Model" from within the "Agent Modeling" category.
+
+===Tutorial===
+
+We've developer have a complete cheat sheet supporting this tutorial. Simply go to '''Help > Cheat Sheets...''' and then select "Run an Example Model" from within the "Agent Modeling" category.
+
+==Extending and Customizing AMP==
+
+This subject is beyond the scope of this Agent Modeling manual. A future Agent Modeling Platform Guide will discuss these issues in detail. For now, please keep an eye on the Wiki and committer blogs. And of course please ask questions on the AMP forum and developer mailing list. Letting us know you're interested in doing something is the best way to get it documented!
+
 
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/510-ProgrammerGuide_AMFPojo.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/510-ProgrammerGuide_AMFPojo.mediawiki
index 753056d..87dc848 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/510-ProgrammerGuide_AMFPojo.mediawiki
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/510-ProgrammerGuide_AMFPojo.mediawiki
@@ -1,14 +1,12 @@
-==More Information==
-
-===Integrating Java and AMF Models===
+==Integrating Java and AMF Models==
 
 If you're like many Java developers, you might find point-and-click interfaces a bit lame. Personally, I've changed my tune in this, and I now define all of my ABM models from the editor, saving Java for truly specialized tasks. But even without generation of agent behavior, Acore can be a really valuable tool, as the GIS example shows. The way to look at metaABM is as a way to compose your overall model and automate the tedious parts. Apart from Java generated code, the AMF meta-model maintains a number of very useful artifacts. For example, the Repast Simphony target maintains model.score and all of the model.rs component. Generally, AMF should save time and hassle while making your models far more transparent even if you never use the Actions component to define agent behavior.
 
-====Method Action====
+===Method Action===
 
 As explained in the action section, you can simply create a "Method" act with hand-written Java code. This option is nice because all code is contained within the AMF file. But it can be difficult to maintain large blocks of Java code as you aren't using a Java editor to edit the Java code itself. One way to get around this is to create your code in the generated Java method and then copy it into the Method action. Note one imporant issue here -- you'll generally have to fully qualify your Java references as you won't be able to change the imports statements directly. 
 
-====Protected Code Regions====
+===Protected Code Regions===
 
 You can mix and match Action behavior with Java and generated code with POJOs. One way to do this is through using protected regions. Select the agent you want to create protected methods for and then select "Generate Protected" from the "Mode" property. Now, create actions just as you have before, or use your existing ones. On code generation, open up the relevant java file and examine the methods that have been created. 
 
@@ -18,7 +16,7 @@
 
 [[Image:images/pojo/ProgrammingPojoGenerateCode.png]]
 
-====Implement Sub-classes====
+===Interface and Base Class Generation===
 
 Another approach which can be more robust is to generate the basic model stubs (like an abstract base class except that it isn't abstract) and then override your model with implementations. AMF provides support for generic skeletons and interfaces.
 
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/520-ProgrammerGuide_Converting.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/520-ProgrammerGuide_Converting.mediawiki
index dce1d30..865c440 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/520-ProgrammerGuide_Converting.mediawiki
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/520-ProgrammerGuide_Converting.mediawiki
@@ -1,17 +1,17 @@
 
-===Converting Existing Ascape models===
+==Converting Existing Ascape Models==
 
 There are only a few changes should have to make to existing Ascape models or to use existing Ascape documentation to develop Escape models.
 
-====Model====
+===Model===
 
 The core model is completely API compatible. No changes!
 
-====View====
+===View===
 
 Because Escape uses SWT and Ascape uses Swing, there are a few unavoidable incompatibilities. Most of these we avoid by using higher level APIs but here are the key changes that you're likely to have to make:
 
-=====Convert the low-level imports from AWT and Swing to SWT=====
+====Convert the low-level imports from AWT and Swing to SWT====
 The simplest way to accomplish this is to remove all of the imports and then organize imports. For example:
  java.awt.Color => org.eclipse.swt.graphics.Color
  java.awt.Graphics => org.eclipse.draw2d.Graphics
@@ -20,18 +20,18 @@
  replace: [nothing]
 You don't have to replace these with the SWT equivalents, just click on the project, right-click and choose "Source:Organize Imports.."
 By the way, a great way to avoid having to select the right entries in optimize imports and to alert you when you have missed anything is to prevent the awt and swing classes from being used at all. Right-click on project, choose "Build Path:Configure Build Path", go to Libraries tab, open JRE System Library, choose "Access Rules", edit, and then add entries for java/awt/** and javax/swing/**. The code will regenerate and you'll have error markers for all of the stuff that won't work with Escape and Eclipse.
-=====Convert color features=====
+====Convert color features====
 You can't use AWT colors either so you'll need to replace any colors. AMP provides a convenience classes for Colors called ColorFeature and ColorFeatureConcrete. You can use these or any of the other ways to define SWT colors. For example:
  Color.lightGray => ColorFeature.LIGHT_GRAY
  new Color(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy) => 
      ColorFeatureConcrete.create(Math.min(1.0f, (float) (redEnergy + orangeEnergy)), (float) orangeEnergy * .8f, (float) blueEnergy)
-=====Change agent color getters=====
+====Change agent color getters====
 If you've defined colors through overriding Agents as in most models, you'll need to change the method signature. You could just do a global replace for this one.
  public Color getColor( => public Object getPlatformColor(
-=====Get rid of image features=====
+====Get rid of image features====
 Escape doesn't support them. In practice they haven't been used a lot. At some point perhaps we'll have nice sprite support instead. :)
  public Image getImage() {**} => ""
-=====Modify usages of DrawFeatures=====
+====Modify usages of DrawFeatures====
 If you've created any of your own draw features, you'll need to change them slightly to accommodate the differences between the AWT and SWT / Draw2D APIs. This should be pretty straightforwrd. For example:
  g.setColor(...
  g.fillOval(..
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/550-ProgrammerGuide_Running.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/550-ProgrammerGuide_Running.mediawiki
deleted file mode 100644
index fdb9853..0000000
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/550-ProgrammerGuide_Running.mediawiki
+++ /dev/null
@@ -1,58 +0,0 @@
-==Running Agent Models==
-
-
-===Exploring Example ABM Models===
-
-The first thing most people will want to do in AMP is to play with the example models. You can explore AMF models as well as some really interesting classic ABM models.
-
-====Downloading Models====
-
-To obtain the models, simply launch the cheat sheet. Go to the '''Help > Cheat Sheets...''' menu and choose "Load Sample Projects".
-
-Or you can get them yourself from the following locations:
-
-=====AMF Models=====
-
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape
-
-To understand the capabilities of AMF, you might also want to try out running the same models automatically generated for Ascape or Repast. These are located at dev.eclipse.org in cvsroot/modeling:
-
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast
-
-=====Escape / Ascape Java Models=====
-
-These are SVN projects in the sourceforge SVN. For help, see [[http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php this page]].
-
- http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.brook
- http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.examples
- 
-====Generating Models====
-
-There are a number of models developed with AMF that can automatically generate example models to run in Escape. There are two ways to run the example models:
-
-=====Creating a New Escape Project=====
-
-The best option is to simply create a new Escape project and drag the models into it!
-
-#If you're not already there, open the Agent Modeling Perspective. Select Window > Open Perspective > Other.. and then Agent Modeling. (Or you can choose Window > Reset Perspective and the Agent Modeling perspective should appear in the Open Perspective list itself.)
-#Next, let's create the project where we'll place our model. Select File > New > Escape AMF Project. Give it a name like "escape.tutorial", then click Finish.
-#Finally grab the Epidemic.metaabm model at http://download.eclipse.org/amp/models/Epidemic.metaabm and drag it into the project. (Depending on your browser the file may load as text directly into your browser, in which case just right-click on the link and save it to a file.)
-
-===Tutorial===
-
-We've developer have a complete cheat sheet supporting this tutorial. Simply go to '''Help > Cheat Sheets...''' and then select "Run an Example Model" from within the "Agent Modeling" category.
-
-
-====Next Steps====
-
-To understand the capabilities of AMF, you might also want to try out running the same models automatically generated for Ascape or Repast.
-
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast
-
-===Classic Java ABM Models===
-
-Many models have been created using Ascape over the years, including all of the classic models created at Brookings and some other cool models such as Craig Reynold's Boids and a pretty cool little traffic model, and they've all been converted to run in Escape. They're in Java but you can execute and explore them in exactly the same way as the Epidemic model above. All of the Ascape example models have been converted (a straightforward process) from their intial Ascape incarnations. For licensing reasons (they're BSD, not EPL) we can't host them directly on the Eclipse site.  You can get the projects in two ways:
-
-Once you've downloaded the projects, open up the src folder and navigate to the Java files for the actual models. For example, to run Conway's Life, you'll want src/edu.brook.life.ConwayLife. Right-click on the Java file and select "Execute". There are many models to explore! (It's not always obvious which Java files are for models, so you may have to poke around a bit. We need to put together a catalog here. Another nice opportunity for user contributions.)
\ No newline at end of file
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/800-InstallationGuide.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/800-InstallationGuide.mediawiki
new file mode 100644
index 0000000..da2cba1
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/800-InstallationGuide.mediawiki
@@ -0,0 +1,108 @@
+=Installation Guide=
+
+==Tools==
+
+===Complete IDE===
+
+You may already have obtained a complete IDE bundled with AMP and other modeling tools. The project contributors offer open source and commercial versions of the AMP tools, which you can find at their sites. If so, you can mostly ignore this chapter unless you want to install an optional component like Repast.
+
+===Eclipse and the Agent Modeling Tools===
+
+You can find more detailed instructions [http://eclipse.org/amp/installing/ here], but here are the basic steps.
+
+#Install the latest version of Eclipse from [http://www.eclipse.org/downloads/ here]. AMP requires version 3.5.x (Gallieo) or higher. Version 3.6 (Hellos) which is currently a development (beta) release works well too. We recommend the "Classic" release at the bottom of the page as the other releases have a bunch of stuff you wont' need.
+#Add update sites for AMP and AMP dependencies. See the screenshot below and the [http://help.eclipse.org/galileo/topic/org.eclipse.platform.doc.user/tasks/tasks-124.htm Eclipse Documentation]. There are different versions of the update sites, depending on whether you want to use the most stable version of the toolset or the "latest and greatest". The update sites are listed below.
+#(Optional) If you install and AMP extensions, add Update Sites for them -- they're also listed below.
+#Select the features that you want to install.
+#Click the '''Next''' button, review the licenses, and then click '''Finish'''.
+
+Agent Modeling Platform update sites:
+ Milestones (recommended): http://download.eclipse.org/amp/updates/milestones
+ Interim (newer): http://download.eclipse.org/amp/updates/interim
+ Nightly (bleeding edge): http://download.eclipse.org/amp/updates/nightly
+
+Update sites for AMP Extensions
+ AGF 3D (recommended): http://lwjgl.org/update
+ AMF for Ascape (recommended for Java developers): http://ascape.sourceforge.net/eclipse
+ AMF for Repast (for people using Repast): http://mirror.anl.gov/pub/repastsimphony/site.xml (non P2)
+
+In the following screenshot, we've added the LWJGL site (not shown) as well as the Ascape site (not shown), but not the Repast site, and we're about to install the respective features. 
+
+[[Image:images/resources/AMPUpdateSite.png]]
+
+Once you've done that, select the '''Help > Help Contents''' menu, find the Agent Modeling Guide and open this overview page within that guide.
+
+===Extensions===
+
+====Ascape====
+
+For licensing and copyright reasons we can't provide all of the Ascape tools and manual on the Eclipse hosted Agent Modeling Project site. None of these tools are necessary to use AMP (the core Ascape support is an IP approved part of the AMP distribution) but they're highly recommended. The Ascape tools include:
+
+#An excellent Manual covering programming Java models in Ascape and Escape. (The API is the same.)
+#Support for creating Ascape Java projects and executing the Swing-based Java Applications. Swing deployed Ascape Java Applications can be as small as 10MB and can be deployed to the web.
+#Eclipse based IDE support for plain Java Ascape projects.
+
+The Ascape update site is at:
+
+ http://ascape.sourceforge.net/eclipse
+ 
+To install Ascape, use the update manager. Select '''Help > Install New Software..."''', add the Ascape update site, select the Ascape category and click the '''Finish''' button.
+
+[[Image:images/resources/AscapeUpdateSite.png]]
+
+====Repast====
+
+The Repast update site is at:
+
+ http://mirror.anl.gov/pub/repastsimphony/site.xml
+
+More information on downloading and installing repast can be found [http://repast.sourceforge.net/docs/development.html here]. Follow the instrucitons for "Configuration B".
+
+==Models==
+
+===Obtaining Example Models===
+
+There is a cheat-sheet available for obtaining the example models. If you would rather obtain them yourself, here is the CVS information:
+
+====Team Project Sets====
+
+You can use the following team project sets. See [http://help.eclipse.org/galileo/topic/org.eclipse.platform.doc.user/tasks/tasks-cvs-project-set.htm this document] for more information about using project sets.
+
+ http://eclipse.org/amp/project-sets/ascape.psf
+ http://eclipse.org/amp/project-sets/escapeAMFExamples.psf
+
+====From Version Control Systems====
+
+Import the CVS projects from the AMP project repository. For help, see [http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/reference/ref-40a.htm this page]. Here are the details for CVS Access:
+
+CVS Repository:
+
+ Connection type:	pserver
+ User:	anonymous
+ Password:	[none]
+ Host:	dev.eclipse.org
+ Path:	/cvsroot/modeling
+ Module:	/org.eclipse.amp
+
+AMF Escape Models:
+
+ org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape 
+
+AMF Ascape and Repast Models:
+
+ org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape 
+ org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast 
+
+The Ascape example projects are available at the Sourceforge SVN server. You can get them at the following locations. See the [[http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php Subversive User Guide]] for more information about using SVN. (You'll need to install Subversion if you don't already have it.)
+
+Escape Java Models:
+
+ https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.models.brook
+ https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.models.examples
+
+Ascape (Swing-based) Java Models:
+
+
+ https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.examples
+ https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.brook
+ 
\ No newline at end of file
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/900-Resources.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/900-Resources.mediawiki
index a09966a..1d2b824 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/900-Resources.mediawiki
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/900-Resources.mediawiki
@@ -1,17 +1,5 @@
 =Resources=
 
-==Obtaining Example Models==
-
-There is a cheat-sheet available for obtaining the example models. If you would rather obtain them yourself, here is the CVS information:
-
-====Import from CVS====
-*Import the CVS projects from the AMP project repository. For help, see [http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/reference/ref-40a.htm this page]. For repository details, see [http://eclipse.org/amp/developers/repositoryDetails.php http://eclipse.org/amp/developers/repositoryDetails.php]. These are the example projects:
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape 
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape 
- org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast 
-*Right-click on the models to execute them.
-*Play around with the model attribute settings and behavior (Acts).
-
 ==Websites==
 
 [http://www.eclipse.org/amp Eclipse Agent Modeling Project (Incubation)]
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/950-Support.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/950-Support.mediawiki
index 815ff3d..75b7aab 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/950-Support.mediawiki
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/950-Support.mediawiki
@@ -3,41 +3,3 @@
 ==Issues==
 
 Eclipse and the AMP project have a mandate for open communication. Please note that unless you are a customer of an AMP project contributor we will not respond to direct requests for support. We ''will'' make every effort to support your use of AMP in the following ways:
-
-===General Support, Questions and Discussion===
-
-The [http://www.eclipse.org/forums/index.php?t=thread&frm_id=17&S=f4fa6cb31327772a3b626dc409db409b Agent Modeling Platform Newsgroup] is the place to discuss or get support for any of the Eclipse AMP tools. 
-
-===View Existing Bugs and Feature Requests===
-
-If you have a problem or idea for improvement, there's a good chance that its already been discovered. To avoid duplication, please check the current bugs before filing a new bug report or feature request.
-
-[https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=AMP&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0= Search Existing Bugs]
-
-===File a Bug===
-
-This may sound obvious, but if something doesn't work as it should, the only way that we're going to find out is if someone reports it. All AMP related bugs or feature requests should use the Eclipse Bugzilla.
-
-[https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AMP&rep_platform=All&op_sys=All File a Bug or Feature Request]
-
-===Discuss AMP Development and Project===
-
-All discussion about software development, design and project management issues take place on the AMP dev-list. If you're interested in contributing to the AMP project, this is a good place to contact us. [https://dev.eclipse.org/mailman/listinfo/amp-dev].
-
-===Professional Support===
-
-The AMP project developers -- among the most experienced developers of agent models and tools anywhere -- are naturally the best source for Agent Modeling development, support and training. Please feel free to contact the project lead or other project contributors directly to discuss professional support options.
-
-===Media and Private Communications===
-
-For project related but non-public communications such as media enquires or potential project sponsorship, please contact Miles Parker, the Eclipse AMP project lead, at amp_enquiry@metascapeabm.com. (Requests for support and other communications to this address will be ignored.)
-
-==Feedback==
-
-If you have ideas, comments or requests for information about the project please contact us at the .
-
-==Get Involved==
-
-If you find this tool valuable, please be aware that most of its development occurred through volunteer contributions from individuals and companies that have received no direct funding. You can support continual development efforts financially by purchasing related software tools from companies and organizations that help develop it, including funding for developer time in grant proposals. You can support the Eclipse platform in general by becoming a member organization of Eclipse. But the most important thing that you can contribute is your own time and enthusiasm, either through directly contributing to AMP or by promoting its use in blogs and other social media. For more detailed information about contributing to AMP, please see [http://wiki.eclipse.org/AMP/Getting_Involved our wiki].
-
- 
\ No newline at end of file
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/951-Support_Issues.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/951-Support_Issues.mediawiki
new file mode 100644
index 0000000..b8d2d49
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/951-Support_Issues.mediawiki
@@ -0,0 +1,19 @@
+===General Support, Questions and Discussion===
+
+The [http://www.eclipse.org/forums/index.php?t=thread&frm_id=17&S=f4fa6cb31327772a3b626dc409db409b Agent Modeling Platform Newsgroup] is the place to discuss or get support for any of the Eclipse AMP tools. Don't hesitate to ask questions about model implementation or bring up more general topics for discussion.
+
+===View Existing Bugs and Feature Requests===
+
+If you have a problem or idea for improvement, there's a good chance that its already been discovered. To avoid duplication, please check the current bugs before filing a new bug report or feature request.
+
+[https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=AMP&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0= Search Existing Bugs]
+
+===File a Bug===
+
+This may sound obvious, but if something doesn't work as it should, the only way that we're going to find out is if someone reports it. All AMP related bugs or feature requests should use the Eclipse Bugzilla.
+
+[https://bugs.eclipse.org/bugs/enter_bug.cgi?product=AMP&rep_platform=All&op_sys=All File a Bug or Feature Request]
+
+===Discuss AMP Development and Project===
+
+All discussion about software development, design and project management issues take place on the AMP dev-list. If you're interested in contributing to the AMP project, this is a good place to contact us. [https://dev.eclipse.org/mailman/listinfo/amp-dev].
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/952-Support_Community.mediawiki b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/952-Support_Community.mediawiki
new file mode 100644
index 0000000..dcbd4d1
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/952-Support_Community.mediawiki
@@ -0,0 +1,13 @@
+==Other Contacts==
+
+===Professional Support===
+
+The AMP project developers -- among the most experienced developers of agent models and tools anywhere -- are naturally the best source for Agent Modeling development, support and training. Please feel free to contact the project lead or other project contributors directly to discuss professional support options.
+
+===Media and Private Communications===
+
+For project related but non-public communications such as media enquires or potential project sponsorship, please contact Miles Parker, the Eclipse AMP project lead, at amp_enquiry@metascapeabm.com. (Requests for support and other communications to this address will be ignored.)
+
+==Get Involved==
+
+If you find this tool valuable, please be aware that most of its development occurred through volunteer contributions from individuals and companies that have received no direct funding. You can support continual development efforts financially by purchasing related software tools from companies and organizations that help develop it, including funding for developer time in grant proposals. You can support the Eclipse platform in general by becoming a member organization of Eclipse. But the most important thing that you can contribute is your own time and enthusiasm, either through directly contributing to AMP or by promoting its use in blogs and other social media. For more detailed information about contributing to AMP, please see [http://wiki.eclipse.org/AMP/Getting_Involved our wiki].
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/amp-index.txt b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/amp-index.txt
index daeb505..6aad486 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/amp-index.txt
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/amp-index.txt
@@ -1,8 +1,7 @@
 010-Guide_Intro.mediawiki
+012-QuickStart.mediawiki
 015-Guide_ABM.mediawiki
 020-Guide_Credits.mediawiki
-050-AMP_Overview.mediawiki
-060-GettingStarted.mediawiki
 100-ModelerGuide_Intro.mediawiki
 110-ModelerGuide_Structure.mediawiki
 120-ModelerGuide_Actions.mediawiki
@@ -20,6 +19,8 @@
 500-ProgrammerGuide_Escape.mediawiki
 510-ProgrammerGuide_AMFPojo.mediawiki
 520-ProgrammerGuide_Converting.mediawiki
-550-ProgrammerGuide_Running.mediawiki
+800-InstallationGuide.mediawiki
 900-Resources.mediawiki
-950-Support.mediawiki
\ No newline at end of file
+950-Support.mediawiki
+951-Support_Issues.mediawiki
+952-Support_Community.mediawiki
\ No newline at end of file
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/images/resources/AMPUpdateSite.png b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/images/resources/AMPUpdateSite.png
new file mode 100644
index 0000000..d320a7c
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/images/resources/AMPUpdateSite.png
Binary files differ
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/images/resources/AscapeUpdateSite.png b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/images/resources/AscapeUpdateSite.png
new file mode 100644
index 0000000..58cbe07
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/doc/images/resources/AscapeUpdateSite.png
Binary files differ
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Actions_2.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Actions_2.html
index 168d749..193e41d 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Actions_2.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Actions_2.html
@@ -66,7 +66,7 @@
 </div>
 </div>
 </div>
-<table id="N1029B">
+<table id="N102B3">
 <tr>
 							
 <td>Before getting into the details of how each Actions work together, or the various kinds of Actions, it will be helpful to take a broad overview of how they all fit together. As discussed above, actions are strung together in a sequence or flow. They're always composed of two parts, though those parts can be assembled and intermixed in many different ways. First, we search for a collection of agents, and then we do something with that selection. We refer to these two parts as Selections and Commands. (For the technically minded, another useful way of looking at the Actions approach is as a Query Transformation language, as with SQL and Stored Procedures.  Except again, the results of the queries along with the transformations flow through from one query to the next.) Selections find the agents we want to do something with, and the commands do it. We need some way to start the whole chain of actions off, and so we have a kind of Selection called a Root Selection, or simply a Root. Secondly, we need some way to actually make the agents exist in the model in the first place, so we have a Create Agents action. Finally, we have special commands called builders that allow us to create the spaces that the agents will occupy. The various actions are discussed in depth in the Details section.</td>
@@ -94,7 +94,7 @@
 						An important aspect of the Actions design is that loop structures are not allowed -- that is, flows are acyclic. An action can never have an ancestor target (that is targets, targets of targets, etc..) that has as one of its ancestors that same action. As you'll see, actions don't typically 
 						<span class="italic">need</span> loop structures. By far the most common use of loops in conventional programming langauges is to loop through collections of objects. As selections (see below) refer to the entire collection of agents, any actions on a selection apply to all members of that collection. Recursive structures are needed for some particular usages and will be supported in future releases, but not through an explicit looping construct.
 					</p>
-<table id="N102B9">
+<table id="N102D1">
 <tr>
 							
 <td>Again, behaviors in Actions are always defined by a set of 
@@ -110,7 +110,7 @@
 						
 </tr>
 </table>
-<table id="N102D3">
+<table id="N102EB">
 <tr>
 							
 <td>The diagram to the right depicts a simple example. Here, we create a rule, and then check the results of two queries. For any agents that meet those criteria, we'll evaluate some function based on their state, and then set some value on them.</td>
@@ -123,7 +123,7 @@
 						
 </tr>
 </table>
-<table id="N102E5">
+<table id="N102FD">
 <tr>
 							
 <td>In this next example, we'll first create the rule, and then create a new selection with a set of criteria. Finally, we'll do a move based on those queries.</td>
@@ -187,7 +187,7 @@
 </div>
 </div>
 <p>Selections are a key concept in Actions. Put simply, selections define what we are searching for and where. They are defined by a combination of Select, Query and Logic Actions. Each time we create a new Select Action, we define a new selection. Queries can be used to further refine selections either immediately after or later in the Action flow, as described in the next section. Logic Actions are used to combine and organize the Action flow defined by Query Actions. In order to understand how these three pieces work together, we need to understand the idea of selection boundaries.</p>
-<table id="N10321">
+<table id="N10339">
 <tr>
 							
 <td>A selection boundary determines the set of selection actions that are used to determine what agents to apply target actions to. For example, in the following diagram, we can see the extent of the boundary for a straightforward selection.</td>
@@ -200,7 +200,7 @@
 						
 </tr>
 </table>
-<table id="N10333">
+<table id="N1034B">
 <tr>
 							
 <td>Each time we create a new selection, we define a new set of boundaries. In the diagram to the right, Selection 1 and Selection 2 eaach start with a new Select Action. </td>
@@ -224,7 +224,7 @@
 </li>
 </ol>
 </div>
-<table id="N10350">
+<table id="N10368">
 <tr>
 							
 <td>In other words, as soon as a Logic Action occurs in a path leading to an Action, any following Query will define a new boundary, as shown in the example to the right. </td>
@@ -262,7 +262,7 @@
 </div>
 </div>
 </div>
-<table id="N1037B">
+<table id="N10393">
 <tr>
 							
 <td>Now, let's put the concepts of Actions sequences and boundaries together to see how we can easily define complex interactions between multiple selections. When we define a Select, the state of its selection flows through and with any subsequent selections. So for example, if we have a Root Action rule, and then do a selection based on it, we'll have access to the agent from the original context as well as all of the subsequent selections. We can refer to any previous selection for any subsequent action. For example, instead of setting the value for the rule agent, we might instead set a value for an agent we've found in a target selection.</td>
@@ -275,7 +275,7 @@
 						
 </tr>
 </table>
-<table id="N1038D">
+<table id="N103A5">
 <tr>
 							
 <td>Inputs to functions also use selections. (We'll discuss more details in the functions section.) In the following example, we're adding the wealth of the Selection 1 agent to the wealth of the Selection 2 agent and using that value to set some other value. (Here, perhaps we are modeling an agent in a winner takes all game, in which case we'd also add a Set Action on Selection 2 and set the second agent's wealth to 0.)</td>
@@ -288,7 +288,7 @@
 						
 </tr>
 </table>
-<table id="N1039F">
+<table id="N103B7">
 <tr>
 							
 <td>But we can also use selections in defining Query Actions themselves. So in the following example, we select a neighbor agent and then compare the age of our Rule agent with the age of the Selection 2 agent. If and only if those ages are the same will we execute the target Set Action. This example also demonstrates why we refer to the data flow as weaving. Query Actions can be used to refine selections at any point in the data flow. Selections and their uses are interwoven throughout an action sequence.</td>
@@ -301,7 +301,7 @@
 						
 </tr>
 </table>
-<table id="N103B1">
+<table id="N103C9">
 <tr>
 							
 <td>Finally, we can put all of these concepts together by weaving selections together with flows. As we discussed in the flow section, if we use multiple paths in the Query, the agents that flow through from any prior Query can follow multiple paths at once. And as we discussed in the selection section, the selection and its boundaries determine what agents we will be working with at any given evaluation point in the flow. Consider the example to the right. As we'll see in the detailed explanation of each Action below, Transformation Actions such as Move or Connect take multiple selections. The first selection defines the set of agents that will be performing the action. In the case of a Move agent, this refers to the mover. The second selection, which for Move we call "destination", refers to the selection that will be receiving the action. In the case of movement this is the agent or location that the Rule agent will be moving to. If we follow the flows through, we can note two important outcomes of our model design -- a Rule agent might move twice if it meets the criteria for both the blue path and the red path and that it might move to a different location each time.</td>
@@ -325,7 +325,7 @@
 </div>
 </div>
 </div>
-<table id="N103C7">
+<table id="N103DF">
 <tr>
 						
 <td>In this section, we'll dig into the specific role of each of the Actions. From the design discussion we hopefully have some sense of how these all fit together in general. Again, the block diagram to the right provides an overview of how the various actions are related. You might want to take a look at the meta-class diagrams in the referernce section as well.</td>
@@ -1381,7 +1381,7 @@
 <div>
 <div>
 <h6 class="title">
-<a name="N1062F"></a>Input Literals</h6>
+<a name="N10647"></a>Input Literals</h6>
 </div>
 </div>
 </div>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Agent-Based_Modeling.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Agent-Based_Modeling.html
new file mode 100644
index 0000000..d5d41d6
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Agent-Based_Modeling.html
@@ -0,0 +1,68 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Agent-Based Modeling</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="Introduction.html" title="Introduction">
+<link rel="prev" href="Introduction.html" title="Introduction">
+<link rel="next" href="Other_Domains.html" title="Other Domains">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Agent-Based Modeling</h1>
+<div class="section" title="Agent-Based Modeling">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Agent-Based_Modeling"></a>Agent-Based Modeling</h2>
+</div>
+</div>
+</div>
+<p>The primary focus of the Agent Modeling Platform tools is "Agent-Based Modeling" (ABM). ABM is an innovative technique used to explore complex phenomenon in many domains, including economics, social sciences, biomedicine, ecology and business operations. ABMs share characteristics with object models, but are:</p>
+<div class="variablelist">
+<dl>
+<dt>
+<span class="term">Spatial</span>
+</dt>
+<dd>
+<p>Models have explicit environment(s) in which agents interact. (An environment need not be a physical landscape; other examples of spatial relationships include social networks or positions within a logic system.)</p>
+</dd>
+<dt>
+<span class="term">Temporal</span>
+</dt>
+<dd>
+<p>Models change over discrete units of time.</p>
+</dd>
+<dt>
+<span class="term">Autonomous</span>
+</dt>
+<dd>
+<p>Agent behaviors are activated independently from other object requests.</p>
+</dd>
+<dt>
+<span class="term">Heterogeneous</span>
+</dt>
+<dd>
+<p>Agents may share behavior definitions but have apparent and distinct states and behaviors.</p>
+</dd>
+<dt>
+<span class="term">Collective</span>
+</dt>
+<dd>
+<p>Models contain large communities of agents which exhibit collaborative and competitive behaviors.</p>
+</dd>
+<dt>
+<span class="term">Emergent</span>
+</dt>
+<dd>
+<p>Agents have collective macro-behaviors that are non-obvious from agent micro-specifications.</p>
+</dd>
+</dl>
+</div>
+<p>Existing scientific models are very good at representing relatively simple systems, but generally speaking aren't very good at representing complex systems. The world is full of complex systems, and our misunderstanding of these systems has prevented us from addressing many of the key challenges facing the world, including the global financial crisis and climate change -- in fact once could argue that our misunderstanding of these systems has strongly contributed to these crises.</p>
+<p>Agent-Based Models (ABMs) seek to represent important real-world dynamics by designing communities of software agents that mimic real entities. Rather than make simplifying assumptions about such systems and then representing them in equation form or as off the shelf algorithmic constructs, the ABM researcher aims to identify key agent state, interaction spaces, and behaviors. Agents are then "let loose" on our computers and we explore what happens next. The computational horsepower exists today to simulate large numbers (e.g. &gt;&gt;10) of interacting, adaptive and autonomous agents but often desktop computers are all we need to explore significant domains. ABMs have been designed to represent all kinds of important natural systems, at scales reaching from cellular mechanics to international trade and are being used to solve truly hard problems in government, business, and academia. ABMs are not a solution to every problem, but they can help us to appreciate and gain unique insight into many systems, and often they can help us to come up with better practical decisions than we might using classic approaches.</p>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Converting_Existing_Ascape_Models.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Converting_Existing_Ascape_Models.html
new file mode 100644
index 0000000..2a3c0e2
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Converting_Existing_Ascape_Models.html
@@ -0,0 +1,158 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Converting Existing Ascape Models</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="Programer_Guide.html" title="Programer Guide">
+<link rel="prev" href="Integrating_Java_and_AMF_Models.html" title="Integrating Java and AMF Models">
+<link rel="next" href="Installation_Guide.html" title="Installation Guide">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Converting Existing Ascape Models</h1>
+<div class="section" title="Converting Existing Ascape Models">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Converting_Existing_Ascape_Models"></a>Converting Existing Ascape Models</h2>
+</div>
+</div>
+</div>
+<p>There are only a few changes should have to make to existing Ascape models or to use existing Ascape documentation to develop Escape models.</p>
+<div class="section" title="Model">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Model"></a>Model</h3>
+</div>
+</div>
+</div>
+<p>The core model is completely API compatible. No changes!</p>
+</div>
+<div class="section" title="View">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="View"></a>View</h3>
+</div>
+</div>
+</div>
+<p>Because Escape uses SWT and Ascape uses Swing, there are a few unavoidable incompatibilities. Most of these we avoid by using higher level APIs but here are the key changes that you're likely to have to make:</p>
+<div class="section" title="Convert the low-level imports from AWT and Swing to SWT">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Convert_the_low-level_imports_from_AWT_and_Swing_to_SWT"></a>Convert the low-level imports from AWT and Swing to SWT</h4>
+</div>
+</div>
+</div>
+<p>The simplest way to accomplish this is to remove all of the imports and then organize imports. For example:</p>
+<div class="literallayout">
+<p>java.awt.Color&nbsp;=&gt;&nbsp;org.eclipse.swt.graphics.Color<br>
+java.awt.Graphics&nbsp;=&gt;&nbsp;org.eclipse.draw2d.Graphics<br>
+
+</p>
+</div>
+<p>Then just do a global find for all of the imports and replace them with nothing. This is a great place for a regexp. Try:</p>
+<div class="literallayout">
+<p>find:&nbsp;import&nbsp;java\.awt\.(.*);<br>
+replace:&nbsp;[nothing]<br>
+
+</p>
+</div>
+<p>You don't have to replace these with the SWT equivalents, just click on the project, right-click and choose "Source:Organize Imports.."
+						By the way, a great way to avoid having to select the right entries in optimize imports and to alert you when you have missed anything is to prevent the awt and swing classes from being used at all. Right-click on project, choose "Build Path:Configure Build Path", go to Libraries tab, open JRE System Library, choose "Access Rules", edit, and then add entries for java/awt/** and javax/swing/**. The code will regenerate and you'll have error markers for all of the stuff that won't work with Escape and Eclipse.</p>
+</div>
+<div class="section" title="Convert color features">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Convert_color_features"></a>Convert color features</h4>
+</div>
+</div>
+</div>
+<p>You can't use AWT colors either so you'll need to replace any colors. AMP provides a convenience classes for Colors called ColorFeature and ColorFeatureConcrete. You can use these or any of the other ways to define SWT colors. For example:</p>
+<div class="literallayout">
+<p>Color.lightGray&nbsp;=&gt;&nbsp;ColorFeature.LIGHT_GRAY<br>
+new&nbsp;Color(Math.min(1.0f,&nbsp;(float)&nbsp;(redEnergy&nbsp;+&nbsp;orangeEnergy)),&nbsp;(float)&nbsp;orangeEnergy&nbsp;*&nbsp;.8f,&nbsp;(float)&nbsp;blueEnergy)&nbsp;=&gt;&nbsp;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;ColorFeatureConcrete.create(Math.min(1.0f,&nbsp;(float)&nbsp;(redEnergy&nbsp;+&nbsp;orangeEnergy)),&nbsp;(float)&nbsp;orangeEnergy&nbsp;*&nbsp;.8f,&nbsp;(float)&nbsp;blueEnergy)<br>
+
+</p>
+</div>
+</div>
+<div class="section" title="Change agent color getters">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Change_agent_color_getters"></a>Change agent color getters</h4>
+</div>
+</div>
+</div>
+<p>If you've defined colors through overriding Agents as in most models, you'll need to change the method signature. You could just do a global replace for this one.</p>
+<div class="literallayout">
+<p>public&nbsp;Color&nbsp;getColor(&nbsp;=&gt;&nbsp;public&nbsp;Object&nbsp;getPlatformColor(<br>
+
+</p>
+</div>
+</div>
+<div class="section" title="Get rid of image features">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Get_rid_of_image_features"></a>Get rid of image features</h4>
+</div>
+</div>
+</div>
+<p>Escape doesn't support them. In practice they haven't been used a lot. At some point perhaps we'll have nice sprite support instead. :)</p>
+<div class="literallayout">
+<p>public&nbsp;Image&nbsp;getImage()&nbsp;{**}&nbsp;=&gt;&nbsp;""<br>
+
+</p>
+</div>
+</div>
+<div class="section" title="Modify usages of DrawFeatures">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Modify_usages_of_DrawFeatures"></a>Modify usages of DrawFeatures</h4>
+</div>
+</div>
+</div>
+<p>If you've created any of your own draw features, you'll need to change them slightly to accommodate the differences between the AWT and SWT / Draw2D APIs. This should be pretty straightforwrd. For example:</p>
+<div class="literallayout">
+<p>g.setColor(...<br>
+g.fillOval(..<br>
+becomes:<br>
+g.setBackgroundColor(<br>
+g.fillOval(..<br>
+
+</p>
+</div>
+<p>That's about it, though it's probable that we've missed something. Please post a message on the amp newsgroup if you run into any other conversion issues.</p>
+</div>
+<div class="section" title="Configuration">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Configuration"></a>Configuration</h4>
+</div>
+</div>
+</div>
+<p>Instead of using Ant, Escape has really nice support for parameterizing and testing models. See 
+						<a class="ulink" href="/wiki/Experimenting_and_Testing" target="_new">Experimenting and Testing</a> (todo). If you do want to work with ant you will need to install the plugins from the Sourceforge download site. (These have dependencies that I didn't want to bother with going through the Eclipse IP process to get in. If for some reason you think these should be part of core Escape let Miles know and I'll take care of it.) Ant has not been tested for Escape so it's not even clear it will work.
+					</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Credits.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Credits.html
index ac6515f..16a1c3d 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Credits.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Credits.html
@@ -6,8 +6,8 @@
 <meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
 <link rel="home" href="index.html" title="Agent Modeling Guide">
 <link rel="up" href="Introduction.html" title="Introduction">
-<link rel="prev" href="Other_Uses.html" title="Other Uses">
-<link rel="next" href="The_Agent_Modeling_Platform_.28AMP.29.html" title="The Agent Modeling Platform (AMP)">
+<link rel="prev" href="The_Agent_Modeling_Platform_.28AMP.29.html" title="The Agent Modeling Platform (AMP)">
+<link rel="next" href="Modeler_Guide.html" title="Modeler Guide">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Credits</h1>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Developing_Models.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Developing_Models.html
index 1ef36c8..225bc2d 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Developing_Models.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Developing_Models.html
@@ -6,8 +6,8 @@
 <meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
 <link rel="home" href="index.html" title="Agent Modeling Guide">
 <link rel="up" href="Programer_Guide.html" title="Programer Guide">
-<link rel="prev" href="Getting_Started_2.html" title="Getting Started">
-<link rel="next" href="More_Information.html" title="More Information">
+<link rel="prev" href="Example_Java_Models.html" title="Example Java Models">
+<link rel="next" href="Executing_Models.html" title="Executing Models">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Developing Models</h1>
@@ -21,17 +21,39 @@
 </div>
 </div>
 <p>The easiest way for Java developers to get started doing agent-based modeling in Eclipse is to begin to write programs using it. To develop new models, you can:</p>
+<div class="section" title="Cheatsheet">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Cheatsheet"></a>Cheatsheet</h3>
+</div>
+</div>
+</div>
+<p>By far the simplest way to get started is with the cheatsheet. This walks you through the complete process of creating a Java based model. 
+					<span class="bold"><strong>Help &gt; Cheat Sheets...</strong></span> and then select "Create an Escape Java Model" from within the "Agent Modeling" category.
+				</p>
+</div>
+<div class="section" title="Steps">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Steps"></a>Steps</h3>
+</div>
+</div>
+</div>
 <div class="orderedlist">
 <ol class="orderedlist" type="1">
 <li class="listitem">
 <p>Create a new Escape project. The Escape projects are actually configured for AMF code generation so there are dependencies and builders in there that you don't need; you can remove all of the escape builders and any of the kitchen sink items. The "Create an Escape Java Model" cheat sheet will walk you through the process of creating a new Java based project and model.</p>
 </li>
 <li class="listitem">
-<p>Or for more experienced Eclipse users, you can simply to just create a new Plugin Project and add the necessary dependencies there. Have a look at the example escape project to see what you need. Note that you will likely need more dependencies then you need to simply build -- this is because the class loader uses the classes from the project path and so runtime classes have to be there as well. We may simply package an Eclipse runtime convenience plugin to gather these dependencies up a bit.</p>
+<p>Or for more experienced Eclipse users, you can simply to just create a new Plug-in Project and add the necessary dependencies there. Have a look at the example escape project to see what you need. Note that you will likely need more dependencies then you need to simply build -- this is because the class loader uses the classes from the project path and so runtime classes have to be there as well. We may simply package an Eclipse runtime convenience plug-in to gather these dependencies up a bit. Then just create new Java classes for your root model scape and agents just as you would for an Ascape project.</p>
 </li>
 </ol>
 </div>
-<p>Then just create new Java classes for your root model scape and agents just as you would for an Ascape project.</p>
+</div>
 </div>
 </body>
 </html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Documentation.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Documentation.html
new file mode 100644
index 0000000..c4171ae
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Documentation.html
@@ -0,0 +1,57 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Documentation</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="Programer_Guide.html" title="Programer Guide">
+<link rel="prev" href="Programer_Guide.html" title="Programer Guide">
+<link rel="next" href="Installation.html" title="Installation">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Documentation</h1>
+<div class="section" title="Documentation">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Documentation"></a>Documentation</h2>
+</div>
+</div>
+</div>
+<p>In addition to this documentation, there are a number of other resources available related to Escape development. Because it's API is based on Ascape, a lot of resources developed for Ascape are equally applicable to Ascape. The Ascape documentation is bundled with some distributions of the AMP tools, but if you are using the Eclipse AMP download, you can access it online or install it from the Ascape update site.</p>
+<div class="section" title="Online">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Online"></a>Online</h3>
+</div>
+</div>
+</div>
+<p>There is a complete 
+					<a class="ulink" href="http://ascape.sourceforge.net/api/index.html" target="_new">Javadoc</a> as well as an 
+					<a class="ulink" href="http://ascape.sourceforge.net/docs/TheAscapeManual5.pdf" target="_new">excellent manual</a> and other web resources. See the 
+					<a class="ulink" href="http://ascape.sourceforge.net" target="_new">Ascape Website</a> for general information.
+				</p>
+</div>
+<div class="section" title="Update Site">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Update_Site"></a>Update Site</h3>
+</div>
+</div>
+</div>
+<p>Or, you can install the Ascape Manual into the eclipse help system by adding the following update site and selecting the "Documentations and Source Code" feature. See the Installation Guide for more information.</p>
+<div class="literallayout">
+<p>http://ascape.sourceforge.net/eclipse<br>
+
+</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Example_Java_Models.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Example_Java_Models.html
new file mode 100644
index 0000000..8eb20fd
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Example_Java_Models.html
@@ -0,0 +1,128 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Example Java Models</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="Programer_Guide.html" title="Programer Guide">
+<link rel="prev" href="Installation.html" title="Installation">
+<link rel="next" href="Developing_Models.html" title="Developing Models">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Example Java Models</h1>
+<div class="section" title="Example Java Models">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Example_Java_Models"></a>Example Java Models</h2>
+</div>
+</div>
+</div>
+<div class="section" title="Exploring Example ABM Models">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Exploring_Example_ABM_Models"></a>Exploring Example ABM Models</h3>
+</div>
+</div>
+</div>
+<p>The first thing most people will want to do in AMP is to play with the example models. You can explore AMF models as well as some really interesting classic ABM models.</p>
+<div class="section" title="Installing Models">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Installing_Models"></a>Installing Models</h4>
+</div>
+</div>
+</div>
+<p>See the Installation Guide to find out how to get the example models.</p>
+<div class="section" title="AMF Models">
+<div class="titlepage">
+<div>
+<div>
+<h5 class="title">
+<a name="AMF_Models"></a>AMF Models</h5>
+</div>
+</div>
+</div>
+<p>All AMF models produce pure Java code so they can be used like any other Escape Java model.</p>
+<div class="literallayout">
+<p>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape<br>
+
+</p>
+</div>
+<p>To understand the capabilities of AMF in producing other kinds of Java models, you might also want to try out running the same models automatically generated for Ascape or Repast. These are located at dev.eclipse.org in cvsroot/modeling:</p>
+<div class="literallayout">
+<p>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape<br>
+org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast<br>
+
+</p>
+</div>
+</div>
+<div class="section" title="Classic Escape / Ascape Java Models">
+<div class="titlepage">
+<div>
+<div>
+<h5 class="title">
+<a name="Classic_Escape_.2F_Ascape_Java_Models"></a>Classic Escape / Ascape Java Models</h5>
+</div>
+</div>
+</div>
+<p>Many models have been created using Ascape over the years, including all of the classic models created at Brookings and some other cool models such as Craig Reynold's Boids and a pretty cool little traffic model, and they've all been converted to run in Escape. They're in Java but you can execute and explore them in exactly the same way as the Epidemic model above. All of the Ascape example models have been converted (a straightforward process) from their intial Ascape incarnations. For licensing reasons (they're BSD, not EPL) we can't host them directly on the Eclipse site.  You can get the projects in two ways:</p>
+<p>Once you've downloaded the projects, open up the src folder and navigate to the Java files for the actual models. For example, to run Conway's Life, you'll want src/edu.brook.life.ConwayLife. Right-click on the Java file and select "Execute". There are many models to explore! (It's not always obvious which Java files are for models, so you may have to poke around a bit. We need to put together a catalog here. Another nice opportunity for user contributions.)</p>
+<p>These are SVN projects in the sourceforge SVN. For help, see 
+							<a class="ulink" href="/wiki/http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php_this_page" target="_new">http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php this page</a>.
+						</p>
+<div class="literallayout">
+<p>http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.brook<br>
+http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.examples<br>
+
+</p>
+</div>
+</div>
+</div>
+<div class="section" title="Generating Models">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Generating_Models"></a>Generating Models</h4>
+</div>
+</div>
+</div>
+<p>And of course, you can always use the AMF tools to generate models and then customize them from there. See the following section on integrating AMF with Java for more on that. There are a number of models developed with AMF that can automatically generate example models to run in Escape. There are two ways to run the example models:</p>
+<div class="section" title="Creating a New Escape Project">
+<div class="titlepage">
+<div>
+<div>
+<h5 class="title">
+<a name="Creating_a_New_Escape_Project"></a>Creating a New Escape Project</h5>
+</div>
+</div>
+</div>
+<p>The best option is to simply create a new Escape project and drag the models into it!</p>
+<div class="orderedlist">
+<ol class="orderedlist" type="1">
+<li class="listitem">
+<p>If you're not already there, open the Agent Modeling Perspective. Select Window &gt; Open Perspective &gt; Other.. and then Agent Modeling. (Or you can choose Window &gt; Reset Perspective and the Agent Modeling perspective should appear in the Open Perspective list itself.)</p>
+</li>
+<li class="listitem">
+<p>Create the project where we'll place our model. Select File &gt; New &gt; Escape AMF Project. Give it a name like "escape.tutorial", then click Finish.</p>
+</li>
+<li class="listitem">
+<p>Finally grab the Epidemic.metaabm model at 
+									<a class="ulink" href="http://download.eclipse.org/amp/models/Epidemic.metaabm" target="_new">http://download.eclipse.org/amp/models/Epidemic.metaabm</a> and drag it into the project. (Depending on your browser the file may load as text directly into your browser, in which case just right-click on the link and save it to a file.)
+								</p>
+</li>
+</ol>
+</div>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Executing_Models.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Executing_Models.html
new file mode 100644
index 0000000..96287c6
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Executing_Models.html
@@ -0,0 +1,42 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Executing Models</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="Programer_Guide.html" title="Programer Guide">
+<link rel="prev" href="Developing_Models.html" title="Developing Models">
+<link rel="next" href="Extending_and_Customizing_AMP.html" title="Extending and Customizing AMP">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Executing Models</h1>
+<div class="section" title="Executing Models">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Executing_Models"></a>Executing Models</h2>
+</div>
+</div>
+</div>
+<p>See the User Guide Execution Section for information on launching and controling models.</p>
+<p>We have a complete cheat sheet supporting this tutorial. Simply go to 
+				<span class="bold"><strong>Help &gt; Cheat Sheets...</strong></span> and then select "Run an Example Model" from within the "Agent Modeling" category.
+			</p>
+<div class="section" title="Tutorial">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Tutorial"></a>Tutorial</h3>
+</div>
+</div>
+</div>
+<p>We've developer have a complete cheat sheet supporting this tutorial. Simply go to 
+					<span class="bold"><strong>Help &gt; Cheat Sheets...</strong></span> and then select "Run an Example Model" from within the "Agent Modeling" category.
+				</p>
+</div>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Exploring.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Exploring.html
index ba419fe..a04ee97 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Exploring.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Exploring.html
@@ -29,7 +29,7 @@
 </div>
 </div>
 </div>
-<table id="N10CC3">
+<table id="N10CDB">
 <tr>
 						
 <td>Launching AMF and Escape models is easy. When an AMF file is selected -- in any of the perspectives -- the toolbar and Application menus are updated to reflect the file you've selected and provide convenient access to other functions. For example, when we click on a metaabm file in the package explorer, model execution buttons appear in the toolbar. If you right-click on a file a pop-up menu appears like the one to the far right -- in this case we're selecting the "Execute Headless" option. To launch a model, just select one of the options. (Note that the execution framework doesn't know whether your code exists in an Escape project or another target project. If you attempt to execute a .metaabm model in an Ascape project for example, you will get an error.)</td>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Extending_and_Customizing_AMP.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Extending_and_Customizing_AMP.html
new file mode 100644
index 0000000..2fc210c
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Extending_and_Customizing_AMP.html
@@ -0,0 +1,26 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Extending and Customizing AMP</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="Programer_Guide.html" title="Programer Guide">
+<link rel="prev" href="Executing_Models.html" title="Executing Models">
+<link rel="next" href="Integrating_Java_and_AMF_Models.html" title="Integrating Java and AMF Models">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Extending and Customizing AMP</h1>
+<div class="section" title="Extending and Customizing AMP">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Extending_and_Customizing_AMP"></a>Extending and Customizing AMP</h2>
+</div>
+</div>
+</div>
+<p>This subject is beyond the scope of this Agent Modeling manual. A future Agent Modeling Platform Guide will discuss these issues in detail. For now, please keep an eye on the Wiki and committer blogs. And of course please ask questions on the AMP forum and developer mailing list. Letting us know you're interested in doing something is the best way to get it documented!</p>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Feedback.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Feedback.html
deleted file mode 100644
index 8b70c78..0000000
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Feedback.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Feedback</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
-<link rel="home" href="index.html" title="Agent Modeling Guide">
-<link rel="up" href="Support.html" title="Support">
-<link rel="prev" href="Support.html" title="Support">
-<link rel="next" href="Get_Involved.html" title="Get Involved">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Feedback</h1>
-<div class="section" title="Feedback">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Feedback"></a>Feedback</h2>
-</div>
-</div>
-</div>
-<p>If you have ideas, comments or requests for information about the project please contact us at the .</p>
-</div>
-</body>
-</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Get_Involved.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Get_Involved.html
index e0ec6be..ab67637 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Get_Involved.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Get_Involved.html
@@ -6,7 +6,7 @@
 <meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
 <link rel="home" href="index.html" title="Agent Modeling Guide">
 <link rel="up" href="Support.html" title="Support">
-<link rel="prev" href="Feedback.html" title="Feedback">
+<link rel="prev" href="Other_Contacts.html" title="Other Contacts">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Get Involved</h1>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Installation.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Installation.html
new file mode 100644
index 0000000..91490e9
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Installation.html
@@ -0,0 +1,30 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Installation</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="Programer_Guide.html" title="Programer Guide">
+<link rel="prev" href="Documentation.html" title="Documentation">
+<link rel="next" href="Example_Java_Models.html" title="Example Java Models">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Installation</h1>
+<div class="section" title="Installation">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Installation"></a>Installation</h2>
+</div>
+</div>
+</div>
+<p>See the Installation Guide for Detailed Information -- that all applies to general Escape usage as well.</p>
+<p>Note that there are no dependendencies on AMF, and therefore EMF or any other modeling technologies to do Java development for Escape or for running generated models within Escape. The deployment environment can be quite light-weight. Simply install the AXF, AGF, and AMP Escape features. You can build from source but in that case you'l need to launch a self-hosted runtime, so it's best to simply install from the update site if you're not actually doing AMP development.</p>
+<p>Escape is 
+				<a class="ulink" href="http://eclipse.org/amp/installing/" target="_new">installed</a> by default with the other model components. If you want to do 3D (really 2 1/2) visualizations, you will want AGF3D and the LWJGL dependency.
+			</p>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Installation_Guide.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Installation_Guide.html
new file mode 100644
index 0000000..aafa8ea
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Installation_Guide.html
@@ -0,0 +1,194 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Installation Guide</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="index.html" title="Agent Modeling Guide">
+<link rel="prev" href="Converting_Existing_Ascape_Models.html" title="Converting Existing Ascape Models">
+<link rel="next" href="Models.html" title="Models">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Installation Guide</h1>
+<div class="chapter" title="Installation Guide">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title">
+<a name="Installation_Guide"></a>Installation Guide</h2>
+</div>
+</div>
+</div>
+<div class="toc">
+<dl>
+<dt>
+<span class="section"><a href="Installation_Guide.html#Tools">Tools</a></span>
+</dt>
+<dt>
+<span class="section"><a href="Models.html">Models</a></span>
+</dt>
+</dl>
+</div>
+<div class="section" title="Tools">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Tools"></a>Tools</h2>
+</div>
+</div>
+</div>
+<div class="section" title="Complete IDE">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Complete_IDE"></a>Complete IDE</h3>
+</div>
+</div>
+</div>
+<p>You may already have obtained a complete IDE bundled with AMP and other modeling tools. The project contributors offer open source and commercial versions of the AMP tools, which you can find at their sites. If so, you can mostly ignore this chapter unless you want to install an optional component like Repast.</p>
+</div>
+<div class="section" title="Eclipse and the Agent Modeling Tools">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Eclipse_and_the_Agent_Modeling_Tools"></a>Eclipse and the Agent Modeling Tools</h3>
+</div>
+</div>
+</div>
+<p>You can find more detailed instructions 
+					<a class="ulink" href="http://eclipse.org/amp/installing/" target="_new">here</a>, but here are the basic steps.
+				</p>
+<div class="orderedlist">
+<ol class="orderedlist" type="1">
+<li class="listitem">
+<p>Install the latest version of Eclipse from 
+							<a class="ulink" href="http://www.eclipse.org/downloads/" target="_new">here</a>. AMP requires version 3.5.x (Gallieo) or higher. Version 3.6 (Hellos) which is currently a development (beta) release works well too. We recommend the "Classic" release at the bottom of the page as the other releases have a bunch of stuff you wont' need.
+						</p>
+</li>
+<li class="listitem">
+<p>Add update sites for AMP and AMP dependencies. See the screenshot below and the 
+							<a class="ulink" href="http://help.eclipse.org/galileo/topic/org.eclipse.platform.doc.user/tasks/tasks-124.htm" target="_new">Eclipse Documentation</a>. There are different versions of the update sites, depending on whether you want to use the most stable version of the toolset or the "latest and greatest". The update sites are listed below.
+						</p>
+</li>
+<li class="listitem">
+<p>(Optional) If you install and AMP extensions, add Update Sites for them -- they're also listed below.</p>
+</li>
+<li class="listitem">
+<p>Select the features that you want to install.</p>
+</li>
+<li class="listitem">
+<p>Click the 
+							<span class="bold"><strong>Next</strong></span> button, review the licenses, and then click 
+							<span class="bold"><strong>Finish</strong></span>.
+						</p>
+</li>
+</ol>
+</div>
+<p>Agent Modeling Platform update sites:</p>
+<div class="literallayout">
+<p>Milestones&nbsp;(recommended):&nbsp;http://download.eclipse.org/amp/updates/milestones<br>
+Interim&nbsp;(newer):&nbsp;http://download.eclipse.org/amp/updates/interim<br>
+Nightly&nbsp;(bleeding&nbsp;edge):&nbsp;http://download.eclipse.org/amp/updates/nightly<br>
+
+</p>
+</div>
+<p>Update sites for AMP Extensions</p>
+<div class="literallayout">
+<p>AGF&nbsp;3D&nbsp;(recommended):&nbsp;http://lwjgl.org/update<br>
+AMF&nbsp;for&nbsp;Ascape&nbsp;(recommended&nbsp;for&nbsp;Java&nbsp;developers):&nbsp;http://ascape.sourceforge.net/eclipse<br>
+AMF&nbsp;for&nbsp;Repast&nbsp;(for&nbsp;people&nbsp;using&nbsp;Repast):&nbsp;http://mirror.anl.gov/pub/repastsimphony/site.xml&nbsp;(non&nbsp;P2)<br>
+
+</p>
+</div>
+<p>In the following screenshot, we've added the LWJGL site (not shown) as well as the Ascape site (not shown), but not the Repast site, and we're about to install the respective features. </p>
+<p>
+					
+</p>
+<div class="mediaobject">
+<img src="images/resources/AMPUpdateSite.png"></div>
+<p>
+				
+</p>
+<p>Once you've done that, select the 
+					<span class="bold"><strong>Help &gt; Help Contents</strong></span> menu, find the Agent Modeling Guide and open this overview page within that guide.
+				</p>
+</div>
+<div class="section" title="Extensions">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Extensions"></a>Extensions</h3>
+</div>
+</div>
+</div>
+<div class="section" title="Ascape">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Ascape"></a>Ascape</h4>
+</div>
+</div>
+</div>
+<p>For licensing and copyright reasons we can't provide all of the Ascape tools and manual on the Eclipse hosted Agent Modeling Project site. None of these tools are necessary to use AMP (the core Ascape support is an IP approved part of the AMP distribution) but they're highly recommended. The Ascape tools include:</p>
+<div class="orderedlist">
+<ol class="orderedlist" type="1">
+<li class="listitem">
+<p>An excellent Manual covering programming Java models in Ascape and Escape. (The API is the same.)</p>
+</li>
+<li class="listitem">
+<p>Support for creating Ascape Java projects and executing the Swing-based Java Applications. Swing deployed Ascape Java Applications can be as small as 10MB and can be deployed to the web.</p>
+</li>
+<li class="listitem">
+<p>Eclipse based IDE support for plain Java Ascape projects.</p>
+</li>
+</ol>
+</div>
+<p>The Ascape update site is at:</p>
+<div class="literallayout">
+<p>http://ascape.sourceforge.net/eclipse<br>
+
+</p>
+</div>
+<p>To install Ascape, use the update manager. Select 
+						<span class="bold"><strong>Help &gt; Install New Software..."</strong></span>, add the Ascape update site, select the Ascape category and click the 
+						<span class="bold"><strong>Finish</strong></span> button.
+					</p>
+<p>
+						
+</p>
+<div class="mediaobject">
+<img src="images/resources/AscapeUpdateSite.png"></div>
+<p>
+					
+</p>
+</div>
+<div class="section" title="Repast">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Repast"></a>Repast</h4>
+</div>
+</div>
+</div>
+<p>The Repast update site is at:</p>
+<div class="literallayout">
+<p>http://mirror.anl.gov/pub/repastsimphony/site.xml<br>
+
+</p>
+</div>
+<p>More information on downloading and installing repast can be found 
+						<a class="ulink" href="http://repast.sourceforge.net/docs/development.html" target="_new">here</a>. Follow the instrucitons for "Configuration B".
+					</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Integrating_Java_and_AMF_Models.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Integrating_Java_and_AMF_Models.html
new file mode 100644
index 0000000..c683788
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Integrating_Java_and_AMF_Models.html
@@ -0,0 +1,84 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Integrating Java and AMF Models</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="Programer_Guide.html" title="Programer Guide">
+<link rel="prev" href="Extending_and_Customizing_AMP.html" title="Extending and Customizing AMP">
+<link rel="next" href="Converting_Existing_Ascape_Models.html" title="Converting Existing Ascape Models">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Integrating Java and AMF Models</h1>
+<div class="section" title="Integrating Java and AMF Models">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Integrating_Java_and_AMF_Models"></a>Integrating Java and AMF Models</h2>
+</div>
+</div>
+</div>
+<p>If you're like many Java developers, you might find point-and-click interfaces a bit lame. Personally, I've changed my tune in this, and I now define all of my ABM models from the editor, saving Java for truly specialized tasks. But even without generation of agent behavior, Acore can be a really valuable tool, as the GIS example shows. The way to look at metaABM is as a way to compose your overall model and automate the tedious parts. Apart from Java generated code, the AMF meta-model maintains a number of very useful artifacts. For example, the Repast Simphony target maintains model.score and all of the model.rs component. Generally, AMF should save time and hassle while making your models far more transparent even if you never use the Actions component to define agent behavior.</p>
+<div class="section" title="Method Action">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Method_Action"></a>Method Action</h3>
+</div>
+</div>
+</div>
+<p>As explained in the action section, you can simply create a "Method" act with hand-written Java code. This option is nice because all code is contained within the AMF file. But it can be difficult to maintain large blocks of Java code as you aren't using a Java editor to edit the Java code itself. One way to get around this is to create your code in the generated Java method and then copy it into the Method action. Note one imporant issue here -- you'll generally have to fully qualify your Java references as you won't be able to change the imports statements directly. </p>
+</div>
+<div class="section" title="Protected Code Regions">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Protected_Code_Regions"></a>Protected Code Regions</h3>
+</div>
+</div>
+</div>
+<p>You can mix and match Action behavior with Java and generated code with POJOs. One way to do this is through using protected regions. Select the agent you want to create protected methods for and then select "Generate Protected" from the "Mode" property. Now, create actions just as you have before, or use your existing ones. On code generation, open up the relevant java file and examine the methods that have been created. </p>
+<p>
+					
+</p>
+<div class="mediaobject">
+<img src="images/pojo/ProgrammingPojoGenerateProps.png"></div>
+<p>
+				
+</p>
+<p>You can put whatever you want within the PROTECTED REGION comments and those changes will be preserved when the model is regenerated. You can create a schedule, rule or watcher, maintain custom code for the actual implementations, and still have the model adapt to changes in the underlying data structure -- if for example you want to import a modified shape file.</p>
+<p>
+					
+</p>
+<div class="mediaobject">
+<img src="images/pojo/ProgrammingPojoGenerateCode.png"></div>
+<p>
+				
+</p>
+</div>
+<div class="section" title="Interface and Base Class Generation">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Interface_and_Base_Class_Generation"></a>Interface and Base Class Generation</h3>
+</div>
+</div>
+</div>
+<p>Another approach which can be more robust is to generate the basic model stubs (like an abstract base class except that it isn't abstract) and then override your model with implementations. AMF provides support for generic skeletons and interfaces.</p>
+<p>
+					
+</p>
+<div class="mediaobject">
+<img src="images/pojo/ProgrammingPojoGenerate.png"></div>
+<p>
+				
+</p>
+</div>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Introduction.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Introduction.html
index 8052731..35265ae 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Introduction.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Introduction.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Agent Modeling Guide">
 <link rel="up" href="index.html" title="Agent Modeling Guide">
 <link rel="prev" href="index.html" title="Agent Modeling Guide">
-<link rel="next" href="Other_Uses.html" title="Other Uses">
+<link rel="next" href="Agent-Based_Modeling.html" title="Agent-Based Modeling">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Introduction</h1>
@@ -23,76 +23,137 @@
 <div class="toc">
 <dl>
 <dt>
-<span class="section"><a href="Introduction.html#Agent-Based_Modeling">Agent-Based Modeling</a></span>
+<span class="section"><a href="Introduction.html#Quick_Start">Quick Start</a></span>
 </dt>
 <dt>
-<span class="section"><a href="Other_Uses.html">Other Uses</a></span>
+<span class="section"><a href="Agent-Based_Modeling.html">Agent-Based Modeling</a></span>
 </dt>
 <dt>
-<span class="section"><a href="Credits.html">Credits</a></span>
+<span class="section"><a href="Other_Domains.html">Other Domains</a></span>
 </dt>
 <dt>
 <span class="section"><a href="The_Agent_Modeling_Platform_.28AMP.29.html">The Agent Modeling Platform (AMP)</a></span>
 </dt>
 <dt>
-<span class="section"><a href="Getting_Started.html">Getting Started</a></span>
+<span class="section"><a href="Credits.html">Credits</a></span>
 </dt>
 </dl>
 </div>
 <p>In this manual we provide an in-depth understanding of what goes into an Agent Model, how you can use the Agent Modeling Framework and related tools to design one and present tutorials to get you started. But before going into details, let's take a quick overview at what agent-based modeling is is and how the Agent Modeling Framework can help you to develop models for ABM or other problem domains.</p>
 <p>We hope you enjoy using the tool, and we look forward to your comments and feedback and most of all participation!</p>
-<div class="section" title="Agent-Based Modeling">
+<div class="section" title="Quick Start">
 <div class="titlepage">
 <div>
 <div>
 <h2 class="title" style="clear: both">
-<a name="Agent-Based_Modeling"></a>Agent-Based Modeling</h2>
+<a name="Quick_Start"></a>Quick Start</h2>
 </div>
 </div>
 </div>
-<p>The primary focus of the Agent Modeling Platform tools is "Agent-Based Modeling" (ABM). ABM is an innovative technique used to explore complex phenomenon in many domains, including economics, social sciences, biomedicine, ecology and business operations. ABMs share characteristics with object models, but are:</p>
-<div class="variablelist">
-<dl>
-<dt>
-<span class="term">Spatial</span>
-</dt>
-<dd>
-<p>Models have explicit environment(s) in which agents interact. (An environment need not be a physical landscape; other examples of spatial relationships include social networks or positions within a logic system.)</p>
-</dd>
-<dt>
-<span class="term">Temporal</span>
-</dt>
-<dd>
-<p>Models change over discrete units of time.</p>
-</dd>
-<dt>
-<span class="term">Autonomous</span>
-</dt>
-<dd>
-<p>Agent behaviors are activated independently from other object requests.</p>
-</dd>
-<dt>
-<span class="term">Heterogeneous</span>
-</dt>
-<dd>
-<p>Agents may share behavior definitions but have apparent and distinct states and behaviors.</p>
-</dd>
-<dt>
-<span class="term">Collective</span>
-</dt>
-<dd>
-<p>Models contain large communities of agents which exhibit collaborative and competitive behaviors.</p>
-</dd>
-<dt>
-<span class="term">Emergent</span>
-</dt>
-<dd>
-<p>Agents have collective macro-behaviors that are non-obvious from agent micro-specifications.</p>
-</dd>
-</dl>
+<p>If you're the kind of person who likes to jump right in, here are the basics.</p>
+<div class="section" title="Install">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Install"></a>Install</h3>
 </div>
-<p>Existing scientific models are very good at representing relatively simple systems, but generally speaking aren't very good at representing complex systems. The world is full of complex systems, and our misunderstanding of these systems has prevented us from addressing many of the key challenges facing the world, including the global financial crisis and climate change -- in fact once could argue that our misunderstanding of these systems has strongly contributed to these crises.</p>
-<p>Agent-Based Models (ABMs) seek to represent important real-world dynamics by designing communities of software agents that mimic real entities. Rather than make simplifying assumptions about such systems and then representing them in equation form or as off the shelf algorithmic constructs, the ABM researcher aims to identify key agent state, interaction spaces, and behaviors. Agents are then "let loose" on our computers and we explore what happens next. The computational horsepower exists today to simulate large numbers (e.g. &gt;&gt;10) of interacting, adaptive and autonomous agents but often desktop computers are all we need to explore significant domains. ABMs have been designed to represent all kinds of important natural systems, at scales reaching from cellular mechanics to international trade and are being used to solve truly hard problems in government, business, and academia. ABMs are not a solution to every problem, but they can help us to appreciate and gain unique insight into many systems, and often they can help us to come up with better practical decisions than we might using classic approaches.</p>
+</div>
+</div>
+<p>If you're using a complete IDE, or have already installed AMP from the Eclipse update sites, you can ignore this step. Otherwise, refer to the Installation Guide at the end of this manual.</p>
+</div>
+<div class="section" title="Welcome!">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Welcome.21"></a>Welcome!</h3>
+</div>
+</div>
+</div>
+<p>When you first run the tools, you will see a welcome screen. If the screen isn't showing, select the 
+					<span class="bold"><strong>Help &gt; Welcome</strong></span> menu. Click on the "Overview", "Samples" or "Tutorials" buttons to begin your exploration.
+				</p>
+</div>
+<div class="section" title="Cheat!">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Cheat.21"></a>Cheat!</h3>
+</div>
+</div>
+</div>
+<p>The Agent Modeling tools come with a number of "Cheat Sheets" to help get you started. You can access them by selecting 
+					<span class="bold"><strong>Help &gt; Cheat Sheets...</strong></span>. Then under the "Agent Modeling" category, select a cheat sheet, such as "Load Sample Projects".
+				</p>
+</div>
+<div class="section" title="Follow the Tutorial">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Follow_the_Tutorial"></a>Follow the Tutorial</h3>
+</div>
+</div>
+</div>
+<p>The tools also come with extensive tutorials. See the "Tutorials" section for more help on that.</p>
+</div>
+<div class="section" title="Follow your Interest">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Follow_your_Interest"></a>Follow your Interest</h3>
+</div>
+</div>
+</div>
+<p>AMP has many potential facets and use cases. Check out the following sections of the manual for more information about..</p>
+<div class="section" title="ABM Researchers">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="ABM_Researchers"></a>ABM Researchers</h4>
+</div>
+</div>
+</div>
+<p>Run an example model using the "Run an Example Model" cheat sheet.</p>
+</div>
+<div class="section" title="ABM Modelers">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="ABM_Modelers"></a>ABM Modelers</h4>
+</div>
+</div>
+</div>
+<p>Create Agent-Based models using simple visual tools and deploy them to a number of popular ABM platforms, including Escape. Follow the tutorial section of the Modeler's guide.</p>
+</div>
+<div class="section" title="ABM Java Developers">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="ABM_Java_Developers"></a>ABM Java Developers</h4>
+</div>
+</div>
+</div>
+<p>Write "Plain Old Java" models within a full-featured agent-based modeling framework. Read Programmers Guide and then try the "Create an Escape Java Model" cheat sheet.</p>
+</div>
+<div class="section" title="Eclipse Plugin Developers">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Eclipse_Plugin_Developers"></a>Eclipse Plugin Developers</h4>
+</div>
+</div>
+</div>
+<p>AXF and AGF provide a number of features based around Eclipse technologies such as GEF, GEF3D, BIRT Charts and Zest. For example, AGF supports dynamic visualization of objects in space, and AXF supports managed UI and headless execution for models of any kind. There isn't currently any general documentation for these features, but we encourage you to look at the APIs and at Escape's implementation of them. They're straightforward and can be useful for a variety of general science platform needs.</p>
+</div>
+</div>
 </div>
 </div>
 </body>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Model_Implementation.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Model_Implementation.html
index 80ae722..38c719e 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Model_Implementation.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Model_Implementation.html
@@ -583,7 +583,7 @@
 <div>
 <div>
 <h5 class="title">
-<a name="N10FD9"></a>Create Select and Query Actions</h5>
+<a name="N10FF1"></a>Create Select and Query Actions</h5>
 </div>
 </div>
 </div>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Modeler_Guide.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Modeler_Guide.html
index 1d3cdcc..1f78e68 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Modeler_Guide.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Modeler_Guide.html
@@ -6,7 +6,7 @@
 <meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
 <link rel="home" href="index.html" title="Agent Modeling Guide">
 <link rel="up" href="index.html" title="Agent Modeling Guide">
-<link rel="prev" href="Getting_Started.html" title="Getting Started">
+<link rel="prev" href="Credits.html" title="Credits">
 <link rel="next" href="Structure.html" title="Structure">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Models.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Models.html
new file mode 100644
index 0000000..a45f5db
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Models.html
@@ -0,0 +1,109 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Models</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="Installation_Guide.html" title="Installation Guide">
+<link rel="prev" href="Installation_Guide.html" title="Installation Guide">
+<link rel="next" href="Resources.html" title="Resources">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Models</h1>
+<div class="section" title="Models">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Models"></a>Models</h2>
+</div>
+</div>
+</div>
+<div class="section" title="Obtaining Example Models">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Obtaining_Example_Models"></a>Obtaining Example Models</h3>
+</div>
+</div>
+</div>
+<p>There is a cheat-sheet available for obtaining the example models. If you would rather obtain them yourself, here is the CVS information:</p>
+<div class="section" title="Team Project Sets">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="Team_Project_Sets"></a>Team Project Sets</h4>
+</div>
+</div>
+</div>
+<p>You can use the following team project sets. See 
+						<a class="ulink" href="http://help.eclipse.org/galileo/topic/org.eclipse.platform.doc.user/tasks/tasks-cvs-project-set.htm" target="_new">this document</a> for more information about using project sets.
+					</p>
+<div class="literallayout">
+<p>http://eclipse.org/amp/project-sets/ascape.psf<br>
+http://eclipse.org/amp/project-sets/escapeAMFExamples.psf<br>
+
+</p>
+</div>
+</div>
+<div class="section" title="From Version Control Systems">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="From_Version_Control_Systems"></a>From Version Control Systems</h4>
+</div>
+</div>
+</div>
+<p>Import the CVS projects from the AMP project repository. For help, see 
+						<a class="ulink" href="http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/reference/ref-40a.htm" target="_new">this page</a>. Here are the details for CVS Access:
+					</p>
+<p>CVS Repository:</p>
+<div class="literallayout">
+<p>Connection&nbsp;type:	pserver<br>
+User:	anonymous<br>
+Password:	[none]<br>
+Host:	dev.eclipse.org<br>
+Path:	/cvsroot/modeling<br>
+Module:	/org.eclipse.amp<br>
+
+</p>
+</div>
+<p>AMF Escape Models:</p>
+<div class="literallayout">
+<p>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape&nbsp;<br>
+
+</p>
+</div>
+<p>AMF Ascape and Repast Models:</p>
+<div class="literallayout">
+<p>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape&nbsp;<br>
+org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast&nbsp;<br>
+
+</p>
+</div>
+<p>The Ascape example projects are available at the Sourceforge SVN server. You can get them at the following locations. See the 
+						<a class="ulink" href="/wiki/http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php_Subversive_User_Guide" target="_new">http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php Subversive User Guide</a> for more information about using SVN. (You'll need to install Subversion if you don't already have it.)
+					</p>
+<p>Escape Java Models:</p>
+<div class="literallayout">
+<p>https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.models.brook<br>
+https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.models.examples<br>
+
+</p>
+</div>
+<p>Ascape (Swing-based) Java Models:</p>
+<div class="literallayout">
+<p>https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.examples<br>
+https://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.brook<br>
+
+</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Other_Contacts.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Other_Contacts.html
new file mode 100644
index 0000000..a78e3b7
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Other_Contacts.html
@@ -0,0 +1,47 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Other Contacts</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="Support.html" title="Support">
+<link rel="prev" href="Support.html" title="Support">
+<link rel="next" href="Get_Involved.html" title="Get Involved">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Other Contacts</h1>
+<div class="section" title="Other Contacts">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Other_Contacts"></a>Other Contacts</h2>
+</div>
+</div>
+</div>
+<div class="section" title="Professional Support">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Professional_Support"></a>Professional Support</h3>
+</div>
+</div>
+</div>
+<p>The AMP project developers -- among the most experienced developers of agent models and tools anywhere -- are naturally the best source for Agent Modeling development, support and training. Please feel free to contact the project lead or other project contributors directly to discuss professional support options.</p>
+</div>
+<div class="section" title="Media and Private Communications">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Media_and_Private_Communications"></a>Media and Private Communications</h3>
+</div>
+</div>
+</div>
+<p>For project related but non-public communications such as media enquires or potential project sponsorship, please contact Miles Parker, the Eclipse AMP project lead, at amp_enquiry@metascapeabm.com. (Requests for support and other communications to this address will be ignored.)</p>
+</div>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Other_Domains.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Other_Domains.html
new file mode 100644
index 0000000..18ffd9e
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Other_Domains.html
@@ -0,0 +1,26 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Other Domains</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="Agent Modeling Guide">
+<link rel="up" href="Introduction.html" title="Introduction">
+<link rel="prev" href="Agent-Based_Modeling.html" title="Agent-Based Modeling">
+<link rel="next" href="The_Agent_Modeling_Platform_.28AMP.29.html" title="The Agent Modeling Platform (AMP)">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Other Domains</h1>
+<div class="section" title="Other Domains">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Other_Domains"></a>Other Domains</h2>
+</div>
+</div>
+</div>
+<p>Many kinds of objects share characteristics of ABM agents -- after all, software agents are used in many other contexts. The Agent Modeling Framework meta-modeling support is potentially suitable (or extendible) for a number of approaches outside of ABM; for example business rules, object interactions, systems dynamics models and traditional discrete event models. Similarly, AMP execution and graphic support can be used for modeling natural systems but could also be used to manage other software agents -- for example independent reasoning tasks or dynamic visualization support.</p>
+</div>
+</body>
+</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Papers.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Papers.html
index b5810a0..ce61583 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Papers.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Papers.html
@@ -6,7 +6,7 @@
 <meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
 <link rel="home" href="index.html" title="Agent Modeling Guide">
 <link rel="up" href="Resources.html" title="Resources">
-<link rel="prev" href="Websites.html" title="Websites">
+<link rel="prev" href="Resources.html" title="Resources">
 <link rel="next" href="Support.html" title="Support">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Programer_Guide.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Programer_Guide.html
index 4d30bd2..f01a9b1 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Programer_Guide.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Programer_Guide.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Agent Modeling Guide">
 <link rel="up" href="index.html" title="Agent Modeling Guide">
 <link rel="prev" href="Model_Implementation.html" title="Model Implementation">
-<link rel="next" href="Getting_Started_2.html" title="Getting Started">
+<link rel="next" href="Documentation.html" title="Documentation">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Programer Guide</h1>
@@ -26,16 +26,28 @@
 <span class="section"><a href="Programer_Guide.html#Overview_6">Overview</a></span>
 </dt>
 <dt>
-<span class="section"><a href="Getting_Started_2.html">Getting Started</a></span>
+<span class="section"><a href="Documentation.html">Documentation</a></span>
+</dt>
+<dt>
+<span class="section"><a href="Installation.html">Installation</a></span>
+</dt>
+<dt>
+<span class="section"><a href="Example_Java_Models.html">Example Java Models</a></span>
 </dt>
 <dt>
 <span class="section"><a href="Developing_Models.html">Developing Models</a></span>
 </dt>
 <dt>
-<span class="section"><a href="More_Information.html">More Information</a></span>
+<span class="section"><a href="Executing_Models.html">Executing Models</a></span>
 </dt>
 <dt>
-<span class="section"><a href="Running_Agent_Models.html">Running Agent Models</a></span>
+<span class="section"><a href="Extending_and_Customizing_AMP.html">Extending and Customizing AMP</a></span>
+</dt>
+<dt>
+<span class="section"><a href="Integrating_Java_and_AMF_Models.html">Integrating Java and AMF Models</a></span>
+</dt>
+<dt>
+<span class="section"><a href="Converting_Existing_Ascape_Models.html">Converting Existing Ascape Models</a></span>
 </dt>
 </dl>
 </div>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Resources.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Resources.html
index c7087a4..4b3a871 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Resources.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Resources.html
@@ -6,8 +6,8 @@
 <meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
 <link rel="home" href="index.html" title="Agent Modeling Guide">
 <link rel="up" href="index.html" title="Agent Modeling Guide">
-<link rel="prev" href="Running_Agent_Models.html" title="Running Agent Models">
-<link rel="next" href="Websites.html" title="Websites">
+<link rel="prev" href="Models.html" title="Models">
+<link rel="next" href="Papers.html" title="Papers">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Resources</h1>
@@ -23,66 +23,37 @@
 <div class="toc">
 <dl>
 <dt>
-<span class="section"><a href="Resources.html#Obtaining_Example_Models">Obtaining Example Models</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Websites.html">Websites</a></span>
+<span class="section"><a href="Resources.html#Websites">Websites</a></span>
 </dt>
 <dt>
 <span class="section"><a href="Papers.html">Papers</a></span>
 </dt>
 </dl>
 </div>
-<div class="section" title="Obtaining Example Models">
+<div class="section" title="Websites">
 <div class="titlepage">
 <div>
 <div>
 <h2 class="title" style="clear: both">
-<a name="Obtaining_Example_Models"></a>Obtaining Example Models</h2>
+<a name="Websites"></a>Websites</h2>
 </div>
 </div>
 </div>
-<p>There is a cheat-sheet available for obtaining the example models. If you would rather obtain them yourself, here is the CVS information:</p>
-<div class="section">
-<div class="titlepage"></div>
-<div class="section" title="Import from CVS">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="N111AE"></a>Import from CVS</h4>
-</div>
-</div>
-</div>
-<div class="itemizedlist">
-<ul class="itemizedlist" type="disc">
-<li class="listitem">
-<p>Import the CVS projects from the AMP project repository. For help, see 
-								<a class="ulink" href="http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/reference/ref-40a.htm" target="_new">this page</a>. For repository details, see 
-								<a class="ulink" href="http://eclipse.org/amp/developers/repositoryDetails.php" target="_new">http://eclipse.org/amp/developers/repositoryDetails.php</a>. These are the example projects:
-							</p>
-</li>
-</ul>
-</div>
-<div class="literallayout">
-<p>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape&nbsp;<br>
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape&nbsp;<br>
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast&nbsp;<br>
-
+<p>
+				
+<a class="ulink" href="http://www.eclipse.org/amp" target="_new">Eclipse Agent Modeling Project (Incubation)</a>
+			
 </p>
-</div>
-<div class="itemizedlist">
-<ul class="itemizedlist" type="disc">
-<li class="listitem">
-<p>Right-click on the models to execute them.</p>
-</li>
-<li class="listitem">
-<p>Play around with the model attribute settings and behavior (Acts).</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
+<p>
+				
+<a class="ulink" href="http://ascape.sourceforge.net" target="_new">Ascape</a>
+			
+</p>
+<p>
+				
+<a class="ulink" href="http://metascapeabm.com" target="_new">Metascape, LLC</a>
+			
+</p>
 </div>
 </div>
 </body>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Structure.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Structure.html
index 976d223..4ce1c60 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Structure.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Structure.html
@@ -225,32 +225,42 @@
 </div>
 </div>
 <p>These can be anyone of the following: </p>
-<table id="N1014D">
-<tr>
-									
-<td>Boolean</td>
-									<td>A value that is simply true or false. Note that unless this value really is a simple binary value, you should consider using state instead. (See details below.) For example, rather than representing gender as a 'Female' boolean value, define a 'Gender' state with values 'Male' and "Female'. Generated artifacts and documentation will be much clearer, and you'll be able to easily modify the model later if for example you discover that there are more than two potential gender categories that are relevant to your model.</td>
-								
-</tr>
-<tr>
-									
-<td>Integer</td>
-									<td>A discrete whole number value, such as "100", "-1", "10029920". It's generally a good idea to represent any value that can never have a decimal value as an integer.</td>
-								
-</tr>
-<tr>
-									
-<td>Real</td>
-									<td>A continuous number value. While these are typically represented in software as floating point numbers, they can conceivably represent numbers at any arbitrary precision and in any scheme. Note that while technically speaking we should be representing irrational numbers, this is not currently supported for default values and users should simply use the closest decimal approximation.</td>
-								
-</tr>
-<tr>
-									
-<td>Symbol</td>
-									<td>A string representing some state. More precisely, a computationally arbitrary value with contextual meaning. This could be any kind of identifier. For example, you might use it to store some kind of input coding from data that is then converted into an object state. Or it could simply be an agent's name. But theoretically (though this is not currently supported) one could imagine a symbol using an idiogram, an icon or even a sound that identifies or represents the agent in question.</td>
-								
-</tr>
-</table>
+<div class="variablelist">
+<dl>
+<dt>
+<span class="term">
+										<span class="bold"><strong>Boolean</strong></span>
+									</span>
+</dt>
+<dd>
+<p>A value that is simply true or false. Note that unless this value really is a simple binary value, you should consider using state instead. (See details below.) For example, rather than representing gender as a 'Female' boolean value, define a 'Gender' state with values 'Male' and "Female'. Generated artifacts and documentation will be much clearer, and you'll be able to easily modify the model later if for example you discover that there are more than two potential gender categories that are relevant to your model.</p>
+</dd>
+<dt>
+<span class="term">
+										<span class="bold"><strong>Integer</strong></span>
+									</span>
+</dt>
+<dd>
+<p>A discrete whole number value, such as "100", "-1", "10029920". It's generally a good idea to represent any value that can never have a decimal value as an integer.</p>
+</dd>
+<dt>
+<span class="term">
+										<span class="bold"><strong>Real</strong></span>
+									</span>
+</dt>
+<dd>
+<p>A continuous number value. While these are typically represented in software as floating point numbers, they can conceivably represent numbers at any arbitrary precision and in any scheme. Note that while technically speaking we should be representing irrational numbers, this is not currently supported for default values and users should simply use the closest decimal approximation.</p>
+</dd>
+<dt>
+<span class="term">
+										<span class="bold"><strong>Symbol</strong></span>
+									</span>
+</dt>
+<dd>
+<p>A string representing some state. More precisely, a computationally arbitrary value with contextual meaning. This could be any kind of identifier. For example, you might use it to store some kind of input coding from data that is then converted into an object state. Or it could simply be an agent's name. But theoretically (though this is not currently supported) one could imagine a symbol using an idiogram, an icon or even a sound that identifies or represents the agent in question.</p>
+</dd>
+</dl>
+</div>
 <p>(Undefined and Numeric types should not be used within a well-defined model.)</p>
 </div>
 <div class="section" title="Default Value">
@@ -387,13 +397,17 @@
 <div class="variablelist">
 <dl>
 <dt>
-<span class="term">Periodic</span>
+<span class="term">
+										<span class="bold"><strong>Periodic</strong></span>
+									</span>
 </dt>
 <dd>
 <p>When encountering an edge, the agent will treat the space as wrapping around to the other side of the space. For example, if the agent at location {1,2} (0-based) within a Moore space (see grid discussion below) of size {10,10} is asked to find some other agent within distance 3, the agent look in the square defined between {8,9} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge. You can imagine this as taking a piece of graph paper and connecting the opposite edges. You can't actually do that with paper, but if you could you would have a toroidal (donut) shape in three dimensions defining the shape in two.</p>
 </dd>
 <dt>
-<span class="term">APeriodic</span>
+<span class="term">
+										<span class="bold"><strong>APeriodic</strong></span>
+									</span>
 </dt>
 <dd>
 <p>When encountering an edge, the agent treats it as the edge of the space. For example, if the agent at location {1,2} is asked to find some other agent within distance 3, the agent look between {0,0} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge.</p>
@@ -449,13 +463,17 @@
 <div class="variablelist">
 <dl>
 <dt>
-<span class="term">Euclidean</span>
+<span class="term">
+										<span class="bold"><strong>Euclidean</strong></span>
+									</span>
 </dt>
 <dd>
 <p>The distance between any two cells is taken to be the "real" distance. For example, if an agent was within a chess board, and we wanted to find all agents within distance three of it, we could determine that by taking a string of length 3, tacking it to the center of the source square, and including all cells whose centers we can reach with the other string end. Note that although Euclidean space may seem the most reasonable neighborhood configuration to choose, this really isn't the case. Euclidean space is continuous whereas grid space is discrete, and mapping the two to each other can create unexpected issues. Still, this is a good choice for models representing notional real spaces.</p>
 </dd>
 <dt>
-<span class="term">Moore</span>
+<span class="term">
+										<span class="bold"><strong>Moore</strong></span>
+									</span>
 </dt>
 <dd>
 <p>Here, the distance between any two cells is defined by the number of edge 
@@ -463,7 +481,9 @@
 										</p>
 </dd>
 <dt>
-<span class="term">Von-Neumann</span>
+<span class="term">
+										<span class="bold"><strong>Von-Neumann</strong></span>
+									</span>
 </dt>
 <dd>
 <p>Here, the distance between any two cells is defined by the number of edge adjacent cells crossed to get between them. This is the set of moves that a rook might make on a chess board -- if a rook could only move one square at a time. It is also often referred to as a Manhattan distance for the self-evident reason.</p>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Support.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Support.html
index ae57448..30a1e5d 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Support.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/Support.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Agent Modeling Guide">
 <link rel="up" href="index.html" title="Agent Modeling Guide">
 <link rel="prev" href="Papers.html" title="Papers">
-<link rel="next" href="Feedback.html" title="Feedback">
+<link rel="next" href="Other_Contacts.html" title="Other Contacts">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Support</h1>
@@ -26,7 +26,7 @@
 <span class="section"><a href="Support.html#Issues">Issues</a></span>
 </dt>
 <dt>
-<span class="section"><a href="Feedback.html">Feedback</a></span>
+<span class="section"><a href="Other_Contacts.html">Other Contacts</a></span>
 </dt>
 <dt>
 <span class="section"><a href="Get_Involved.html">Get Involved</a></span>
@@ -55,7 +55,7 @@
 </div>
 </div>
 <p>The 
-					<a class="ulink" href="http://www.eclipse.org/forums/index.php?t=thread&amp;frm_id=17&amp;S=f4fa6cb31327772a3b626dc409db409b" target="_new">Agent Modeling Platform Newsgroup</a> is the place to discuss or get support for any of the Eclipse AMP tools. 
+					<a class="ulink" href="http://www.eclipse.org/forums/index.php?t=thread&amp;frm_id=17&amp;S=f4fa6cb31327772a3b626dc409db409b" target="_new">Agent Modeling Platform Newsgroup</a> is the place to discuss or get support for any of the Eclipse AMP tools. Don't hesitate to ask questions about model implementation or bring up more general topics for discussion.
 				</p>
 </div>
 <div class="section" title="View Existing Bugs and Feature Requests">
@@ -103,28 +103,6 @@
 					<a class="ulink" href="https://dev.eclipse.org/mailman/listinfo/amp-dev" target="_new">https://dev.eclipse.org/mailman/listinfo/amp-dev</a>.
 				</p>
 </div>
-<div class="section" title="Professional Support">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Professional_Support"></a>Professional Support</h3>
-</div>
-</div>
-</div>
-<p>The AMP project developers -- among the most experienced developers of agent models and tools anywhere -- are naturally the best source for Agent Modeling development, support and training. Please feel free to contact the project lead or other project contributors directly to discuss professional support options.</p>
-</div>
-<div class="section" title="Media and Private Communications">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Media_and_Private_Communications"></a>Media and Private Communications</h3>
-</div>
-</div>
-</div>
-<p>For project related but non-public communications such as media enquires or potential project sponsorship, please contact Miles Parker, the Eclipse AMP project lead, at amp_enquiry@metascapeabm.com. (Requests for support and other communications to this address will be ignored.)</p>
-</div>
 </div>
 </div>
 </body>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/The_Agent_Modeling_Platform_.28AMP.29.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/The_Agent_Modeling_Platform_.28AMP.29.html
index a159dda..bf836f5 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/The_Agent_Modeling_Platform_.28AMP.29.html
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/The_Agent_Modeling_Platform_.28AMP.29.html
@@ -6,8 +6,8 @@
 <meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
 <link rel="home" href="index.html" title="Agent Modeling Guide">
 <link rel="up" href="Introduction.html" title="Introduction">
-<link rel="prev" href="Credits.html" title="Credits">
-<link rel="next" href="Getting_Started.html" title="Getting Started">
+<link rel="prev" href="Other_Domains.html" title="Other Domains">
+<link rel="next" href="Credits.html" title="Credits">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">The Agent Modeling Platform (AMP)</h1>
@@ -20,8 +20,8 @@
 </div>
 </div>
 </div>
-<p>The Eclipse Agent Modeling Project (Incubation) or "AMP" provides extensible frameworks and exemplary tools for representing, editing, generating,
-				executing and visualizing agent-based models (ABMs) and any other domain requiring spatial, behavioral and functional features. AMP has two main themes that complement but don't depend on one another, modeling of agent systems (AMF) and execution and exploration of those systems (AXF, AGF and Escape).</p>
+<p>The Eclipse Agent Modeling Project (Incubation) or "AMP" provides the core support for both open source and commercial modeling tools. AMP in turn is built upon Elipse, the most powerful, well-supported and popular Integrated Development Platform (IDE) available anywhere.</p>
+<p>AMP provides extensible frameworks and exemplary tools for representing, editing, generating, executing and visualizing ABMs and any other domain requiring spatial, behavioral and functional features. AMP has two main themes that complement but don't depend on one another, modeling of agent systems (AMF) and execution and exploration of those systems (AXF, AGF and Escape).</p>
 <p>The overall AMP architecture and project dependencies are summarized in the architectural diagram below:</p>
 <p>
 				
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/images/resources/AMPUpdateSite.png b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/images/resources/AMPUpdateSite.png
new file mode 100644
index 0000000..d320a7c
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/images/resources/AMPUpdateSite.png
Binary files differ
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/help/images/resources/AscapeUpdateSite.png b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/images/resources/AscapeUpdateSite.png
new file mode 100644
index 0000000..58cbe07
--- /dev/null
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/help/images/resources/AscapeUpdateSite.png
Binary files differ
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Introduction.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Introduction.html
deleted file mode 100644
index 73553f2..0000000
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Introduction.html
+++ /dev/null
@@ -1,338 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Chapter&nbsp;1.&nbsp;Introduction</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
-<link rel="home" href="index.html" title="Agent Modeling Guide">
-<link rel="up" href="index.html" title="Agent Modeling Guide">
-<link rel="prev" href="index.html" title="Agent Modeling Guide">
-<link rel="next" href="Modeler_Guide.html" title="Chapter&nbsp;2.&nbsp;Modeler Guide">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<div class="navheader">
-<table summary="Navigation header" width="100%">
-<tr>
-<th align="center" colspan="3">Chapter&nbsp;1.&nbsp;Introduction</th>
-</tr>
-<tr>
-<td align="left" width="20%"><a accesskey="p" href="index.html">Prev</a>&nbsp;</td><th align="center" width="60%">&nbsp;</th><td align="right" width="20%">&nbsp;<a accesskey="n" href="Modeler_Guide.html">Next</a></td>
-</tr>
-</table>
-<hr>
-</div>
-<div class="chapter" title="Chapter&nbsp;1.&nbsp;Introduction">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title">
-<a name="Introduction"></a>Chapter&nbsp;1.&nbsp;Introduction</h2>
-</div>
-</div>
-</div>
-<div class="toc">
-<dl>
-<dt>
-<span class="section"><a href="Introduction.html#Agent-Based_Modeling">Agent-Based Modeling</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Introduction.html#Other_Uses">Other Uses</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Introduction.html#Credits">Credits</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Introduction.html#The_Agent_Modeling_Platform_.28AMP.29">The Agent Modeling Platform (AMP)</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Introduction.html#Agent_Modeling_Framework_.28AMF.29">Agent Modeling Framework (AMF)</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Introduction.html#Agent_Execution_Framework_.28AXF.29">Agent Execution Framework (AXF)</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Introduction.html#Agent_Graphics_Framework_.28AGF.29">Agent Graphics Framework (AGF)</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Introduction.html#Escape">Escape</a></span>
-</dt>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Introduction.html#Getting_Started">Getting Started</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Introduction.html#Setting_up_Eclipse">Setting up Eclipse</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Introduction.html#Get_the_Example_Projects">Get the Example Projects</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Introduction.html#ABM_Researchers">ABM Researchers</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Introduction.html#ABM_Modelers">ABM Modelers</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Introduction.html#ABM_Java_Developers">ABM Java Developers</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Introduction.html#Eclipse_Plugin_Developers">Eclipse Plugin Developers</a></span>
-</dt>
-</dl>
-</dd>
-</dl>
-</div>
-<p>In this manual we provide an in-depth understanding of what goes into an Agent Model, how you can use the Agent Modeling Framework and related tools to design one and present tutorials to get you started. But before going into details, let's take a quick overview at what agent-based modeling is is and how the Agent Modeling Framework can help you to develop models for ABM or other problem domains.</p>
-<p>We hope you enjoy using the tool, and we look forward to your comments and feedback and most of all participation!</p>
-<div class="section" title="Agent-Based Modeling">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Agent-Based_Modeling"></a>Agent-Based Modeling</h2>
-</div>
-</div>
-</div>
-<p>The primary focus of the Agent Modeling Platform tools is "Agent-Based Modeling" (ABM). ABM is an innovative technique used to explore complex phenomenon in many domains, including economics, social sciences, biomedicine, ecology and business operations. ABMs share characteristics with object models, but are:</p>
-<div class="variablelist">
-<dl>
-<dt>
-<span class="term">Spatial</span>
-</dt>
-<dd>
-<p>Models have explicit environment(s) in which agents interact. (An environment need not be a physical landscape; other examples of spatial relationships include social networks or positions within a logic system.)</p>
-</dd>
-<dt>
-<span class="term">Temporal</span>
-</dt>
-<dd>
-<p>Models change over discrete units of time.</p>
-</dd>
-<dt>
-<span class="term">Autonomous</span>
-</dt>
-<dd>
-<p>Agent behaviors are activated independently from other object requests.</p>
-</dd>
-<dt>
-<span class="term">Heterogeneous</span>
-</dt>
-<dd>
-<p>Agents may share behavior definitions but have apparent and distinct states and behaviors.</p>
-</dd>
-<dt>
-<span class="term">Collective</span>
-</dt>
-<dd>
-<p>Models contain large communities of agents which exhibit collaborative and competitive behaviors.</p>
-</dd>
-<dt>
-<span class="term">Emergent</span>
-</dt>
-<dd>
-<p>Agents have collective macro-behaviors that are non-obvious from agent micro-specifications.</p>
-</dd>
-</dl>
-</div>
-<p>Existing scientific models are very good at representing relatively simple systems, but generally speaking aren't very good at representing complex systems. The world is full of complex systems, and our misunderstanding of these systems has prevented us from addressing many of the key challenges facing the world, including the global financial crisis and climate change -- in fact once could argue that our misunderstanding of these systems has strongly contributed to these crises.</p>
-<p>Agent-Based Models (ABMs) seek to represent important real-world dynamics by designing communities of software agents that mimic real entities. Rather than make simplifying assumptions about such systems and then representing them in equation form or as off the shelf algorithmic constructs, the ABM researcher aims to identify key agent state, interaction spaces, and behaviors. Agents are then "let loose" on our computers and we explore what happens next. The computational horsepower exists today to simulate large numbers (e.g. &gt;&gt;10) of interacting, adaptive and autonomous agents but often desktop computers are all we need to explore significant domains. ABMs have been designed to represent all kinds of important natural systems, at scales reaching from cellular mechanics to international trade and are being used to solve truly hard problems in government, business, and academia. ABMs are not a solution to every problem, but they can help us to appreciate and gain unique insight into many systems, and often they can help us to come up with better practical decisions than we might using classic approaches.</p>
-</div>
-<div class="section" title="Other Uses">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Other_Uses"></a>Other Uses</h2>
-</div>
-</div>
-</div>
-<p>Many kinds of objects share characteristics of ABM agents -- after all, software agents are used in many other contexts. The Agent Modeling Framework meta-modeling support is potentially suitable (or extendible) for a number of approaches outside of ABM; for example business rules, object interactions, systems dynamics models and traditional discrete event models. Similarly, AMP execution and graphic support can be used for modeling natural systems but could also be used to manage other software agents -- for example independent reasoning tasks or dynamic visualization support.</p>
-</div>
-<div class="section" title="Credits">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Credits"></a>Credits</h2>
-</div>
-</div>
-</div>
-<p>Miles Parker is a consultant and software developer with over ten years of experience in the agent-based modeling field and twenty years developing object-oriented tools and frameworks and is the architect and project lead for the Eclipse Agent Modeling Platform (Incubation).</p>
-<p>Metascape, LLC is the primary contributor to AMP and provides Agent-Based Modeling tools, including sophisticated tools based on the AMF platform, and comprehensive consulting services. For more information on Metascape products and services visit 
-				<a class="ulink" href="http://metascapeabm.com" target="_new">http://metascapeabm.com</a>.
-			</p>
-<p>The AMF meta-model started life as 
-				<a class="ulink" href="/wiki/http://www.agent2005.anl.gov/2006procpdf/Parker_Agent_2006.pdf" target="_new">"score"</a>, a component of the Repast Simphony environment. Argonne National Labs supported the initial development in 2007 and agreed to contribute the relevant IP to the Eclipse project in 2009. It wasn't fully utilized within Simphony, and migrated from there to the MetaABM project supported by Metascape. The MetaABM project defined a complete editor, code-generation and model execution suite that formed the initial AMP AMF contribution. Metascape has sponsored the development of AMF from 2007 through the present.
-			</p>
-<p>The AMP logo was inspired by the 
-				<a class="ulink" href="/wiki/http://swarm.org_Swarm_logo" target="_new">http://swarm.org Swarm logo</a> with their kind permission.
-			</p>
-</div>
-<div class="section" title="The Agent Modeling Platform (AMP)">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="The_Agent_Modeling_Platform_.28AMP.29"></a>The Agent Modeling Platform (AMP)</h2>
-</div>
-</div>
-</div>
-<p>The Eclipse Agent Modeling Project (Incubation) or "AMP" provides extensible frameworks and exemplary tools for representing, editing, generating,
-				executing and visualizing agent-based models (ABMs) and any other domain requiring spatial, behavioral and functional features. AMP has two main themes that complement but don't depend on one another, modeling of agent systems (AMF) and execution and exploration of those systems (AXF, AGF and Escape).</p>
-<p>The overall AMP architecture and project dependencies are summarized in the architectural diagram below:</p>
-<p>
-				
-</p>
-<div class="mediaobject">
-<img src="images/AMPArchitectureDiagram.jpg"></div>
-<p>
-			
-</p>
-<div class="section" title="Agent Modeling Framework (AMF)">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Agent_Modeling_Framework_.28AMF.29"></a>Agent Modeling Framework (AMF)</h3>
-</div>
-</div>
-</div>
-<p>AMF provides an ABM meta-model representation, editor, generator and development environment. The AMF Acore meta-model is similar to EMF Ecore and defined in Ecore, but provides high-level support for complex agents.AMF generates complete executable models for Escape, Ascape and Repast Simphony, as well as Java Skeletons and Interfaces, JUnit test cases and documentation and is easily extensible to support additional targets. For more on AMF, see the Modeler Guide.</p>
-</div>
-<div class="section" title="Agent Execution Framework (AXF)">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Agent_Execution_Framework_.28AXF.29"></a>Agent Execution Framework (AXF)</h3>
-</div>
-</div>
-</div>
-<p>The execution framework provides services and UI for model management, execution, and views. Arbitrary toolkits can easily integrate with Eclipse and AXF by implementing pluggable providers like engines, agents and view parts. AXF is not just for ABM -- anyone who needs support for executing, managing and visualizing collections of objects may find it useful. AXF user tools are covered extensively in the User Guide, and the forthcoming Platform Developers Guide will provide information about integrating AXF in your own tools.</p>
-</div>
-<div class="section" title="Agent Graphics Framework (AGF)">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Agent_Graphics_Framework_.28AGF.29"></a>Agent Graphics Framework (AGF)</h3>
-</div>
-</div>
-</div>
-<p>The graphics framework extends GEF, GEF3D, Zest, and the BIRT charting engine to support real-time visualization of and interaction with agent models. AGF currently provides support for 2D, 2 1/2 D. and graph structures, and will be extended to 3-D, GIS and others. As with other AMP components, the AGF design focus is to provide an extensible infrastructure so that platform adopters can easily create their own view and editor parts. AGF user tools are covered extensively in the User Guide, and the forthcoming Platform Developers Guide will provide information about integrating and extending AGF in your own tools.</p>
-</div>
-<div class="section" title="Escape">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Escape"></a>Escape</h3>
-</div>
-</div>
-</div>
-<p>Escape is an exemplar ABM toolset. It's based on Ascape, which has been in use for more than 10 years. The core API is very stable, and that should give users a way to explore the features of AMP without concerns about keeping in synch with the rapidly evolving AXF /AGF API. It allows modelers to code in Java and/or generate models with AMF and then execute those models within the same development environment. Escape is the primary target for most of the models in this guide. Those users interested in writing code directly to the Escape API can refer to the Programmer Guide.</p>
-</div>
-</div>
-<div class="section" title="Getting Started">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Getting_Started"></a>Getting Started</h2>
-</div>
-</div>
-</div>
-<p>AMP has many potential facets and use cases.</p>
-<div class="section" title="Setting up Eclipse">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Setting_up_Eclipse"></a>Setting up Eclipse</h3>
-</div>
-</div>
-</div>
-<p>If you're reading this from the Eclipse help browser, you've already done this! Otherwise, if you aren't using a full download version of AMP, you'll need to 
-					<a class="ulink" href="http://eclipse.org/amp/installing/" target="_new">install it</a>. Once you've done that, select the 
-					<span class="bold"><strong>Help &gt; Help Contents</strong></span> menu, find the Agent Modeling Guide and open this overview page within that guide.
-				</p>
-<p>Some installations will also include a Welcome screen which will guide you through the same set of steps.</p>
-</div>
-<div class="section" title="Get the Example Projects">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Get_the_Example_Projects"></a>Get the Example Projects</h3>
-</div>
-</div>
-</div>
-<p>You can do that using a cheat sheet. Select 
-					<span class="bold"><strong>Help &gt; Cheat Sheets...</strong></span> and then under the "Agent Modeling" category, select "Load Sample Projects".
-				</p>
-<p>Then check out the following sections of the manual for more information about..</p>
-</div>
-<div class="section" title="ABM Researchers">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="ABM_Researchers"></a>ABM Researchers</h3>
-</div>
-</div>
-</div>
-<p>Run an example model using the "Run an Example Model" cheat sheet.</p>
-</div>
-<div class="section" title="ABM Modelers">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="ABM_Modelers"></a>ABM Modelers</h3>
-</div>
-</div>
-</div>
-<p>Create Agent-Based models using simple visual tools and deploy them to a number of popular ABM platforms, including Escape. Follow the tutorial section of the Modeler's guide.</p>
-</div>
-<div class="section" title="ABM Java Developers">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="ABM_Java_Developers"></a>ABM Java Developers</h3>
-</div>
-</div>
-</div>
-<p>Write "Plain Old Java" models within a full-featured agent-based modeling framework. Read Programmers Guide and then try the "Create an Escape Java Model" cheat sheet.</p>
-</div>
-<div class="section" title="Eclipse Plugin Developers">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Eclipse_Plugin_Developers"></a>Eclipse Plugin Developers</h3>
-</div>
-</div>
-</div>
-<p>AXF and AGF provide a number of features based around Eclipse technologies such as GEF, GEF3D, BIRT Charts and Zest. For example, AGF supports dynamic visualization of objects in space, and AXF supports managed UI and headless execution for models of any kind. There isn't currently any general documentation for these features, but we encourage you to look at the APIs and at Escape's implementation of them. They're straightforward and can be useful for a variety of general science platform needs.</p>
-</div>
-</div>
-</div>
-<div class="navfooter">
-<hr>
-<table summary="Navigation footer" width="100%">
-<tr>
-<td align="left" width="40%"><a accesskey="p" href="index.html">Prev</a>&nbsp;</td><td align="center" width="20%">&nbsp;</td><td align="right" width="40%">&nbsp;<a accesskey="n" href="Modeler_Guide.html">Next</a></td>
-</tr>
-<tr>
-<td valign="top" align="left" width="40%">Agent Modeling Guide&nbsp;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td valign="top" align="right" width="40%">&nbsp;Chapter&nbsp;2.&nbsp;Modeler Guide</td>
-</tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Modeler_Guide.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Modeler_Guide.html
deleted file mode 100644
index ef6b528..0000000
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Modeler_Guide.html
+++ /dev/null
@@ -1,4132 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Chapter&nbsp;2.&nbsp;Modeler Guide</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
-<link rel="home" href="index.html" title="Agent Modeling Guide">
-<link rel="up" href="index.html" title="Agent Modeling Guide">
-<link rel="prev" href="Introduction.html" title="Chapter&nbsp;1.&nbsp;Introduction">
-<link rel="next" href="User_Guide.html" title="Chapter&nbsp;3.&nbsp;User Guide">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<div class="navheader">
-<table summary="Navigation header" width="100%">
-<tr>
-<th align="center" colspan="3">Chapter&nbsp;2.&nbsp;Modeler Guide</th>
-</tr>
-<tr>
-<td align="left" width="20%"><a accesskey="p" href="Introduction.html">Prev</a>&nbsp;</td><th align="center" width="60%">&nbsp;</th><td align="right" width="20%">&nbsp;<a accesskey="n" href="User_Guide.html">Next</a></td>
-</tr>
-</table>
-<hr>
-</div>
-<div class="chapter" title="Chapter&nbsp;2.&nbsp;Modeler Guide">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title">
-<a name="Modeler_Guide"></a>Chapter&nbsp;2.&nbsp;Modeler Guide</h2>
-</div>
-</div>
-</div>
-<div class="toc">
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Overview">Overview</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Agent_Modeling_Framework">Agent Modeling Framework</a></span>
-</dt>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Structure">Structure</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Overview_2">Overview</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Details">Details</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#General">General</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Agents">Agents</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Attributes_2">Attributes</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Spaces_2">Spaces</a></span>
-</dt>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Reference">Reference</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Diagrams">Diagrams</a></span>
-</dt>
-</dl>
-</dd>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Actions_2">Actions</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Overview_3">Overview</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Concepts">Concepts</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Kinds_of_Actions">Kinds of Actions</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Flow">Flow</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Selections">Selections</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Weaving">Weaving</a></span>
-</dt>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Details_3">Details</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Selections_2">Selections</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Roots">Roots</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Builders">Builders</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Commands">Commands</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Other">Other</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Query_and_Evaluation_Inputs">Query and Evaluation Inputs</a></span>
-</dt>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Example">Example</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Reference_2">Reference</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Diagrams_2">Diagrams</a></span>
-</dt>
-</dl>
-</dd>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Functions">Functions</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Overview_4">Overview</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Details_5">Details</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#General_Functions">General Functions</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Random">Random</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Space_3">Space</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Time">Time</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Graphics">Graphics</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Lists">Lists</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Attribute_Distributions">Attribute Distributions</a></span>
-</dt>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Reference_3">Reference</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Modeler_Guide.html#Diagrams_3">Diagrams</a></span>
-</dt>
-</dl>
-</dd>
-</dl>
-</dd>
-</dl>
-</div>
-<div class="section" title="Overview">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Overview"></a>Overview</h2>
-</div>
-</div>
-</div>
-<p>In this section we present the design of the Agent Modeling Framework and explain how it can be used to create models that are transparent, composable and adaptable. Fundamentally, an agent-based model, or "ABM", is composed of five pieces: Agents and Context Agents, Attributes, Spaces, and Actions. The first three refer to structural components, whereas Actions define behavior. Agent models also have styles, which are a special kind of Action used to determine how to portray an agent in a visualization. Finally Actions make use of Functions. We'll describe of these components in a separate section.</p>
-<div class="section" title="Agent Modeling Framework">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Agent_Modeling_Framework"></a>Agent Modeling Framework</h3>
-</div>
-</div>
-</div>
-<p>The Eclipse Platform provides many unique features that make it ideal for an ABM platform. AMF provides easy to use and powerful tools and techniques for designing Agent-Based Models, including a common representation, editors, generators and development environment.</p>
-<p>The Agent Modeling Framework (AMF) provides high level representations for common ABM constructs, and introduces novel ways of representing agents and their behaviors. As detailed in other documentation sections, the Agent Modeling Framework and related tools have been designed to allow researchers to explore complex models in an intuitive way. One of our major design goals has been to create tools that non-programmers can use to create sophisticated models. It has been our experience that using Model-Driven Software Development (MDSD) techniques increase productivity for all developers regardless of skill level. </p>
-<p>The foundation of the Agent Modeling Framework is "Acore". The current version uses an interim version of Acore called "MetaABM". We refer to the AMF models as "meta-models" because they are used to define 
-					<span class="italic">how</span> Agent-Based Models are themselves modeled. For those familiar with Eclipse Model-Driven Development tools, AMF is analogous to EMF but is targeted toward the design and execution of models composed of agents. Acore and MetaABM are defined in Ecore but provide a more direct and high-level ABM representation of agents, including spatial, behavioral and functional features sufficient to generate complete executable models for the target platforms. AMF is fully integrated with the Eclipse IDE platform, but Acore models themselves need have no dependencies on any particular technology beyond XML/XSD.
-				</p>
-<p>Models designed in AMF are transparently converted to Java code for leading Agent-Based Modeling tools, such as the Escape tools which are included in AMP and allow direct execution of models within the AMP environment, and Repast Simphony, another popular Java based ABM tool. These tools create Java code that can then be compiled, executed and event modified in these environments just as with any other Java program. AMF's generative capability is designed to be pluggable and modular so that other developers can create AMF generators for their own tools. In fact, targets can be designed that have no inherent dependencies on Eclipse or even on a traditional platform.</p>
-<p>The Acore / MetaABM meta-model is made up of three main packages. This is all based on MetaABM, and while names and important details will change for Acore, the core design should be quite similar.</p>
-</div>
-</div>
-<div class="section" title="Structure">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Structure"></a>Structure</h2>
-</div>
-</div>
-</div>
-<div class="section" title="Overview">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Overview_2"></a>Overview</h3>
-</div>
-</div>
-</div>
-<p>The basic structure of an agent-based model can be quite simple. While there are many subtle complexities  -- beyond the scope of this manual -- we can construct most models following some straightforward and elegant design principles. And in fact, one of the main goals of the Agent Modeling Framework is to provide a consistent framework that can support using those principles to support the creation of models that can be easily understood, shared, and that can be used interchangeably as components in other models.</p>
-<p>Unlike the approach of a traditional Object Oriented environment, the dominant organizing principal for agents within AMF follows a compositional hierarchical model, not an inheritance model. (Inheritance-like behavior will be supported in forthcoming versions of Acore, but in a more sophisticated, flexible and dynamic way than is supported by traditional programming languages such as Java.) Contexts -- also referred to as "Swarms" or "Scapes", are simply Agents that are capable of containing other agents. With this basic construct -- known as a Composition in design pattern language -- agents are able to contain other agents.</p>
-</div>
-<div class="section" title="Details">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Details"></a>Details</h3>
-</div>
-</div>
-</div>
-<div class="section" title="General">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="General"></a>General</h4>
-</div>
-</div>
-</div>
-<p>Everything represented in an Acore model needs to be referred to in some way. Just as software classes have names, Acore provides a way to label and describe every entity, but in a richer and more maintainable way. All entities in Acore -- including Actions and Functions which we describe in the next two sections -- have a number of shared values.</p>
-<div class="section" title="Named Entities">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Named_Entities"></a>Named Entities</h5>
-</div>
-</div>
-</div>
-<div class="section" title="Label">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Label"></a>Label</h6>
-</div>
-</div>
-</div>
-<p>A reasonably short, human readable name for the agent. For example, "Timber Wolf", "Exchange Trader" or "Movement Probability". These should be defined so that they fit in well with auto-generated documentation. Note that Labels must be unique throughout the model. (This may change in future releases for Action names.) If you try to provide an object with a name that is already in use, "Copy" will be appended to the end of the name. </p>
-</div>
-<div class="section" title="ID">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="ID"></a>ID</h6>
-</div>
-</div>
-</div>
-<p>An ID is an identifier that can be used to represent the object in a software program. This means that it must follow certain rules such as no-spaces or non alpha-numeric characters. The editing tools will help make sure that this value is legal. Note that when you enter a label, a legal ID is automatically created for you! Usually you won't need to change this, but you might if for example you want the value to match up with some database or other external representation. So reasonable values here might be "timberWolf" or perhaps "MVMNT_PRB" if say you're trying to match up to some old statistics records you have. (Note that currently IDs by default use "camel case", i.e. "thisIsAnExampleOfCamelCase" to match with Java variable naming conventions, but this is likely to change.) Like labels, IDs need to be unique across the model, and the editing tools will assign a different id if you attempt to give two entities the same id.</p>
-<p>And most entities also define:</p>
-</div>
-<div class="section" title="Description">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Description"></a>Description</h6>
-</div>
-</div>
-</div>
-<p>A complete textual description of the object. Don't overlook this -- it is the most important part of your model. The description will show up in your auto-generated html documentation, software documentation and even in your running model. You should include enough information that model users will understand what the entity is for and what it does without referring elsewhere. This is also where any attributions and references should go. You can put html tags in here -- such as href's to external papers, but keep those to a minimum as they won't be rendered as html in all contexts.</p>
-</div>
-<div class="section" title="Plural Label">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Plural_Label"></a>Plural Label</h6>
-</div>
-</div>
-</div>
-<p>The plural representation of an entity. This can be a surprisingly useful thing to have in generated documentation and software code, so it's worth maintaining. The editor will automatically add an "s" at the end of the label you've entered above, but you change it to whatever is appropriate. For example "Person", or "Timber Wolves".</p>
-</div>
-</div>
-</div>
-<div class="section" title="Agents">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Agents"></a>Agents</h4>
-</div>
-</div>
-</div>
-<div class="section" title="Simple Agents">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Simple_Agents"></a>Simple Agents</h5>
-</div>
-</div>
-</div>
-<p>An Agent is simply a software object that has autonomous behavior and (generally speaking) exists within some set of spaces. By autonomous, we mean that agents make the choice about when and how to execute a behavior, as opposed to have that controlled from "above", so to speak. Like any software objects, agents have attributes (fields) and actions (methods) associated with them.</p>
-<div class="section" title="Attributes">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Attributes"></a>Attributes</h6>
-</div>
-</div>
-</div>
-<p>As described in the attribute sections above.</p>
-</div>
-<div class="section" title="Actions">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Actions"></a>Actions</h6>
-</div>
-</div>
-</div>
-<p>Described in the "Actions" section.</p>
-</div>
-<div class="section" title="Styles">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Styles"></a>Styles</h6>
-</div>
-</div>
-</div>
-<p>Special actions that are used to define how to draw an agent graphically as also described in the "Actions" section and detailed in the "Functions" section.</p>
-</div>
-</div>
-<div class="section" title="Context Agents (Contexts)">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Context_Agents_.28Contexts.29"></a>Context Agents (Contexts)</h5>
-</div>
-</div>
-</div>
-<p>As detailed above, agents also form the basic structural component of an agent-based model. To get an idea for how this works, have a look at the "EpidemicRegional.metaabm" model. Note that in future releases, we will probably refer to Contexts as "Scapes".</p>
-<div class="section" title="Agents">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Agents_2"></a>Agents</h6>
-</div>
-</div>
-</div>
-<p>The agents that are contained within this context. For example, a context representing a city might contain an Individual Agent for defining all individuals in the model, and a Vehicle agent defining all vehicles. Note that when we refer to an agent in this context, we mean a general type or class of agent, not the agent itself.</p>
-</div>
-<div class="section" title="Spaces">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Spaces"></a>Spaces</h6>
-</div>
-</div>
-</div>
-<p>The set of all spaces contained or subsumed by the agent. For example, a context representing a city might contain a geographical space and a transportation network space.</p>
-</div>
-</div>
-</div>
-<div class="section" title="Attributes">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Attributes_2"></a>Attributes</h4>
-</div>
-</div>
-</div>
-<p>Agents need some way to represent their internal state. For example, an agent in an economic model might have a wealth attribute, and an agent in an ecology model might have a quantity of food and a particular vision range. These states are represented as attributes just as all software objects do. In an agent model, we keep richer information about these attributes and generally represent them at a higher level. For example, rather than specify that a real value is a "double", a "float" or a "big number", we represent them as "Reals" so that they can be implemented and tested in different environments. This might allow us for instance to ensure that a model's behavior is not dependent on a particular machine implementation of floating point arithmetic. Also, note that attributes only represent so-called "primitive" values -- that is, actual measurable features of a particular agent but not an agent's relationship to other agents or objects. See the discussion about networks for more on this key topic.</p>
-<p>Here are the basic types of attributes available in Acore models:</p>
-<div class="section" title="Basic Attributes">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Basic_Attributes"></a>Basic Attributes</h5>
-</div>
-</div>
-</div>
-<p>Attributes are single values that a given agent contains. For example, an agent might have an "Age" attribute. In this section we go over the values you can set for the attributes. For those with a tecnical bent, note that we are technically describing the meta-attributes for the meta-class "SAttribute". But it is far too confusing to refer to the attributes of attributes! So we'll just refer to the attributes that any of our model components as "values".</p>
-<div class="section" title="Type">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Type"></a>Type</h6>
-</div>
-</div>
-</div>
-<p>These can be anyone of the following: </p>
-<table id="N1014D">
-<tr>
-									
-<td>Boolean</td>
-									<td>A value that is simply true or false. Note that unless this value really is a simple binary value, you should consider using state instead. (See details below.) For example, rather than representing gender as a 'Female' boolean value, define a 'Gender' state with values 'Male' and "Female'. Generated artifacts and documentation will be much clearer, and you'll be able to easily modify the model later if for example you discover that there are more than two potential gender categories that are relevant to your model.</td>
-								
-</tr>
-<tr>
-									
-<td>Integer</td>
-									<td>A discrete whole number value, such as "100", "-1", "10029920". It's generally a good idea to represent any value that can never have a decimal value as an integer.</td>
-								
-</tr>
-<tr>
-									
-<td>Real</td>
-									<td>A continuous number value. While these are typically represented in software as floating point numbers, they can conceivably represent numbers at any arbitrary precision and in any scheme. Note that while technically speaking we should be representing irrational numbers, this is not currently supported for default values and users should simply use the closest decimal approximation.</td>
-								
-</tr>
-<tr>
-									
-<td>Symbol</td>
-									<td>A string representing some state. More precisely, a computationally arbitrary value with contextual meaning. This could be any kind of identifier. For example, you might use it to store some kind of input coding from data that is then converted into an object state. Or it could simply be an agent's name. But theoretically (though this is not currently supported) one could imagine a symbol using an idiogram, an icon or even a sound that identifies or represents the agent in question.</td>
-								
-</tr>
-</table>
-<p>(Undefined and Numeric types should not be used within a well-defined model.)</p>
-</div>
-<div class="section" title="Default Value">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Default_Value"></a>Default Value</h6>
-</div>
-</div>
-</div>
-<p>The value that should be assigned to the attribute at the beginning of any model run. The attribute may of course be assigned a different value in an Initialize rule, but its a good idea to specify one here. It's OK to leave it blank, in which case a sensible 'empty' value will be assigned, i.e. false for Boolean, 0 for Integers and Reals, and an empty string for Symbol.</p>
-</div>
-<div class="section" title="Gather Data">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Gather_Data"></a>Gather Data</h6>
-</div>
-</div>
-</div>
-<p>Here you can specify whether executing models should collect aggregate values for the data. For example, if you select this value as true for a 'Wealth' attribute, Escape will automatically keep track of minimum, maximum, average, sum and optionally standard deviation and variance across all agents for each model execution period. All of these statistics will then be selectable with a mouse click to appear in your model charts at runtime.</p>
-</div>
-<div class="section" title="Immutable">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Immutable"></a>Immutable</h6>
-</div>
-</div>
-</div>
-<p>This value indicates whether you expect the model value to change. If you know that it won't or shouldn't, this value should be true.</p>
-</div>
-<div class="section" title="Units">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Units"></a>Units</h6>
-</div>
-</div>
-</div>
-<p>Specifies what the attribute is actually measuring. For example, if you're defining an attribute for "Wealth" in the context of a model of the world economy, you might specify "USD". If you're defining "Age", you might specify "Years", for "Mass" "Kg". Like description, this value is often overlooked, but can be critically important to allowing yourself and others to understand and correctly calibrate a model. Note that this will also allow you to simplify variable names -- instead of using "Age in Years", you can simply specify "Age" and the appropriate unit. It may be obvious to you that your model is concerned with age in years, but a user who needs to specify a different granularity will be grateful for more clarity.</p>
-</div>
-</div>
-<div class="section" title="Arrays">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Arrays"></a>Arrays</h5>
-</div>
-</div>
-</div>
-<p>Arrays are simply attributes with zero or more entries. For example, you might have an array of three Real numbers representing the Red Green and Blue color components for an object. Note that if you find yourself defining very complex sets of arrays, its likely that what you really want to define is a new agent with attributes for each array. In addition to what is defined above, arrays specify:</p>
-<div class="section" title="Size">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Size"></a>Size</h6>
-</div>
-</div>
-</div>
-<p>The number of values that the array attribute will contain.</p>
-</div>
-</div>
-<div class="section" title="States">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="States"></a>States</h5>
-</div>
-</div>
-</div>
-<p>States represent any agent quality that may take on one of a number of well defined values. For example, an "Ice Cream Consumer" Agent might contain a state of "Ice Cream Preference" with options of "Chocolate", "Vanilla" and "Ginger".</p>
-<div class="section" title="State Options">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="State_Options"></a>State Options</h6>
-</div>
-</div>
-</div>
-<p>Create new options for states by adding them to the state node. States are simple described items. Don't forget to provide a description! States also have</p>
-</div>
-<div class="section" title="Default Option">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Default_Option"></a>Default Option</h6>
-</div>
-</div>
-</div>
-<p>unlike for regular attributes, this option is not optional! Simply pick a state option to be assigned that the agent will take if no other option has been assigned.</p>
-</div>
-</div>
-</div>
-<div class="section" title="Spaces">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Spaces_2"></a>Spaces</h4>
-</div>
-</div>
-</div>
-<p>All contexts can contain spaces. Spaces provide an environment in which agents can have a physical or notional location and upon which they can interact with one another and their environment. Agents can exist in more than one space at a time, and a given agent need not exist in every space. (Note that this is different from the Repast Simphony notion of projections, though the two representational approaches are generally compatible.) Agents need not represent explicit, "real" spatial structures such as a landscape, though this is of course the most common use. They can also represent relational and state information, such as a belief space or a social network. There are four kinds of space represented:</p>
-<div class="section" title="Space (Continuous)">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Space_.28Continuous.29"></a>Space (Continuous)</h5>
-</div>
-</div>
-</div>
-<p>In the modeling tools, we simply refer to this as a "Space" as it is represents the general concept of a space. A space is simply something that contains objects with certain locations and extents and has a certain number of dimensions. The space is continuous, in the sense that objects can be placed anywhere with arbitrary position. Spaces hold attributes, which simply define their dimensions-- see below.</p>
-<div class="section" title="Border Rule">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Border_Rule"></a>Border Rule</h6>
-</div>
-</div>
-</div>
-<p>A value representing what happens to an agent when that agent is asked to move beyond its extent.</p>
-<div class="variablelist">
-<dl>
-<dt>
-<span class="term">Periodic</span>
-</dt>
-<dd>
-<p>When encountering an edge, the agent will treat the space as wrapping around to the other side of the space. For example, if the agent at location {1,2} (0-based) within a Moore space (see grid discussion below) of size {10,10} is asked to find some other agent within distance 3, the agent look in the square defined between {8,9} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge. You can imagine this as taking a piece of graph paper and connecting the opposite edges. You can't actually do that with paper, but if you could you would have a toroidal (donut) shape in three dimensions defining the shape in two.</p>
-</dd>
-<dt>
-<span class="term">APeriodic</span>
-</dt>
-<dd>
-<p>When encountering an edge, the agent treats it as the edge of the space. For example, if the agent at location {1,2} is asked to find some other agent within distance 3, the agent look between {0,0} and {4,5}. An agent asked to move beyond the confines of the space will simply stop when it reaches the edge.</p>
-</dd>
-</dl>
-</div>
-<p>The "Strict" and "Bouncy" values are obsolete and should not be used.</p>
-</div>
-<div class="section" title="Dimensionality">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Dimensionality"></a>Dimensionality</h6>
-</div>
-</div>
-</div>
-<p>The number of dimensions that the space has. After selecting a dimensionality, attributes will be added to represent each dimension. For example, if you enter 3 here, you will have an attribute for X, Y, and Z. Be sure to enter default values here, as they will be used to specify the actual size of the space.</p>
-</div>
-</div>
-<div class="section" title="Grid">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Grid"></a>Grid</h5>
-</div>
-</div>
-</div>
-<p>A grid is technically a regular lattice structure. Currently, only rectilinear structures are supported, i.e. a One-dimensional vector, a two-dimensional grid, a three-dimensional cube and so on. (Though none of the current target platforms support n-d spaces yet.) </p>
-<p>Like continuous spaces, a grid has a border rule and dimensionality. A grid has a couple of other important values:</p>
-<div class="section" title="Multi-Occupant">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Multi-Occupant"></a>Multi-Occupant</h6>
-</div>
-</div>
-</div>
-<p>Does the grid allow more than one agent to occupy it at a time? This value may be replaced with another mechanism in future releases.</p>
-</div>
-<div class="section" title="Neighborhood">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Neighborhood"></a>Neighborhood</h6>
-</div>
-</div>
-</div>
-<p>This value determines what constitutes a region within a particular distance from the agent. The value for this is often critical in obtaining particular behavior from a model, and shouldn't be overlooked. There are three possible values:</p>
-<div class="variablelist">
-<dl>
-<dt>
-<span class="term">Euclidean</span>
-</dt>
-<dd>
-<p>The distance between any two cells is taken to be the "real" distance. For example, if an agent was within a chess board, and we wanted to find all agents within distance three of it, we could determine that by taking a string of length 3, tacking it to the center of the source square, and including all cells whose centers we can reach with the other string end. Note that although Euclidean space may seem the most reasonable neighborhood configuration to choose, this really isn't the case. Euclidean space is continuous whereas grid space is discrete, and mapping the two to each other can create unexpected issues. Still, this is a good choice for models representing notional real spaces.</p>
-</dd>
-<dt>
-<span class="term">Moore</span>
-</dt>
-<dd>
-<p>Here, the distance between any two cells is defined by the number of edge 
-											<span class="italic">or</span> corner adjacent cells crossed to get between them. To continue the chess board analogy, this is the set of moves that a king can make. Note that this does not map well to real space at all, as a cell at distance 1 in a moore space is at distance sqrt(2) in "real" space.
-										</p>
-</dd>
-<dt>
-<span class="term">Von-Neumann</span>
-</dt>
-<dd>
-<p>Here, the distance between any two cells is defined by the number of edge adjacent cells crossed to get between them. This is the set of moves that a rook might make on a chess board -- if a rook could only move one square at a time. It is also often referred to as a Manhattan distance for the self-evident reason.</p>
-</dd>
-</dl>
-</div>
-</div>
-</div>
-<div class="section" title="Network">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Network"></a>Network</h5>
-</div>
-</div>
-</div>
-<p>A network represents a set of relationships between agents, in a graph structure. The concept is pretty simple, but note that a network is actually a critical part of many AMF models. This is because we use networks to represent any kind of references between agents. You may have noticed in the discussion about attributes that there is no generic "object" type for an attribute. In fact, attributes only contain primitive values. So we will use networks to do the kinds of things that we would often use object references for in a traditional Object-Oriented model. For example, if an agent is a member of a family, rather than have that agent have a member attribute of "family" with a reference to the "Family" object, the modeler would create a "Family Members" network and connect agent's to their families as appropriate. This implies that network members can contain members of many different types.</p>
-<p>A network has only one value to specify:</p>
-<div class="section" title="Directed">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Directed"></a>Directed</h6>
-</div>
-</div>
-</div>
-<p>This indicates whether connections between agents are one-way or two-way. If this value is false, then if a connection is made between an agent A and an agent B, and agent B searches within distance 1, agent B will find agent A. If this value is true, agent A can find agent B, but agent B can not find agent A. (Unless of course some other path leads B to A.)</p>
-</div>
-</div>
-<div class="section" title="Geography">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Geography"></a>Geography</h5>
-</div>
-</div>
-</div>
-<p>A geography represents a physical landscape. Here we assume that that landscape is going to be defined by an external data source and representational scheme -- typically a Geographical Information System. We'll describe how to work with GIS in more detail when we discuss builder actions.</p>
-</div>
-</div>
-</div>
-<div class="section" title="Reference">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Reference"></a>Reference</h3>
-</div>
-</div>
-</div>
-<div class="section" title="Diagrams">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Diagrams"></a>Diagrams</h4>
-</div>
-</div>
-</div>
-<p>For readers familiar with UML and meta-modeling, the following diagrams give more detail on the structural design.</p>
-<div class="section" title="Meta-Classes">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Meta-Classes"></a>Meta-Classes</h5>
-</div>
-</div>
-</div>
-<p>Our first diagram depicts the core structural design of the model. </p>
-<p>
-							
-</p>
-<div class="mediaobject">
-<img src="images/structure/StructureComplexDiagram.png"></div>
-<p> 
-						
-</p>
-<div class="literallayout">
-<p>There&nbsp;seems&nbsp;to&nbsp;be&nbsp;a&nbsp;lot&nbsp;going&nbsp;on&nbsp;here,&nbsp;but&nbsp;the&nbsp;basic&nbsp;components&nbsp;are&nbsp;pretty&nbsp;straightforward&nbsp;as&nbsp;we&nbsp;can&nbsp;see&nbsp;in&nbsp;the&nbsp;next&nbsp;diagram.<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Key Collaborations">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Key_Collaborations"></a>Key Collaborations</h5>
-</div>
-</div>
-</div>
-<p>
-							
-</p>
-<div class="mediaobject">
-<img src="images/structure/StructureSimpleDiagram.png"></div>
-<p>
-						
-</p>
-<div class="literallayout">
-<p>Core&nbsp;interactions&nbsp;are&nbsp;in&nbsp;Red.&nbsp;The&nbsp;meta-model&nbsp;structure&nbsp;is&nbsp;essentially&nbsp;a&nbsp;Composite&nbsp;pattern.&nbsp;<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Details">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Details_2"></a>Details</h5>
-</div>
-</div>
-</div>
-<div class="orderedlist">
-<ol class="orderedlist" type="1">
-<li class="listitem">
-<p>Every model has at its root a Context (Scape). Contexts are Agents that are capable of containing other Agents (including other contexts, naturally). </p>
-</li>
-<li class="listitem">
-<p>(Meta-level) Contexts contain (meta-level) Agents at the model (design-time) level.  At runtime, (model-level) Context instances defined in a (meta-level) SContext will contain (model-level) agent instances of the defined (meta-level) SAgent. This sounds more complicated than it is, so let's look at a simple example. Suppose we create a new Context, and give it a label of "Wiki Example". Within that Context, we create an Agent and give it a label of "Individual" and another Agent with the label "Block". At runtime when we are actually executing the model we will have one WikiExample model instance  which contains a number of Individuals.</p>
-</li>
-<li class="listitem">
-<p>Agents contain Attributes, such as Vision and Age. Context attributes often represent input parameters for contained agents. For example, our Wiki Agent Context might contain an Individual Count as well as a Minimum Age and Maximum Age.</p>
-</li>
-<li class="listitem">
-<p>Contexts can contain Projections (Spaces), which represent some kind of spatial or structural interaction space for the agents; either a grid, a continuous (euclidean) space, or a network (graph) or geographic space of some kind. For example, we might want to have a City that contains Blocks and that an Individual can move around within.</p>
-</li>
-<li class="listitem">
-<p>Agents are Actable and thus can contain any number of behaviors called "Actions", described in detail in the next section. Actions can describe individual behavior, and at the Context (Scape) level can define how member Agents and Projections are created.</p>
-</li>
-<li class="listitem">
-<p>Styles provide a mechanism for defining generic visualization behavior for Agents and so are also Actable. For example, an Agent might have an Action that says effectively "draw a red circle shaded red for the wealth of the agent".</p>
-</li>
-</ol>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="section" title="Actions">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Actions_2"></a>Actions</h2>
-</div>
-</div>
-</div>
-<p>Actions are the most important part of an agent model. While Agents, Attributes and Spaces define what we're modeling, it is Actions that give the models life.</p>
-<div class="section" title="Overview">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Overview_3"></a>Overview</h3>
-</div>
-</div>
-</div>
-<p>Actions allow the definition of behavior for agents at a very high level. You can think of actions as being analogous to methods in a traditional object-oriented model but that analogy only goes so far. In the same way that methods are defined as part of objects, actions belong to particular agents. (Though even more expressive ways of defining actions are contemplated in future releases.) In the next section we go into detail about what Actions are and how they can be used to define all agent behavior. They are also conceptually more challenging as unlike with structure they have no direct analogies to past agent representations.</p>
-<p>An action provides simple, well-defined details that a model can use to determine what steps to take in model execution. That definition seems general enough to be almost useless, but its important to understand that an action is not equivalent to an instruction, a method or a query. In fact, actions can have aspects of all of these. But an action is not in itself an instruction specifying exactly 
-					<span class="italic">how</span> the modeling engine should do something -- instead an action represents 
-					<span class="italic">what</span> the modeler intends for the agents to do. (Technically, we might say that Actions takes a "declarative" approach instead of an 'imperative' approach, but that's not quite true, because actions do allow us to define behavior in a richer way than most declarative approaches, and many action constructs map directly to imperative approaches.)
-				</p>
-<p>Actions are connected together in a series of sources and targets. (Technically, an acyclic directed graph.) In an abstract sense that is similar to the way any programming language is defined although that structure isn't usually obvious because of the constraints of textual representations. But unlike a typical programming language, in Actions it is not the execution thread (the processor) that moves from one instruction to the next, but the result of the previous action. In this way, action results "flow" from the output of one action into the next action.</p>
-<p>Why are these distinctions between traditional Object-Oriented and the Action approaches important? They give us the advantages of simplicity, clarity and flexibility that 
-					<a class="ulink" href="/wiki/http://en.wikipedia.org/wiki/Dataflow_programming" target="_new">data-flow approaches</a> like spreadsheets and some query languages have, but with less restrictions. At the same time, they can bring us much of the power and expressiveness of 
-					<a class="ulink" href="/wiki/http://en.wikipedia.org/wiki/Functional_programming" target="_new">functional languages</a> like Lisp or 
-					<a class="ulink" href="/wiki/http://en.wikipedia.org/wiki/Logical_programming" target="_new">logical languages</a> like Prolog, but without the level of complexity and obscurity that such languages can have.
-				</p>
-<p>We can get a better idea for how Actions work by thinking about how a spreadsheet works. In a spreadsheet, we might define a cell A that adds up a row of data, say "Income". We might define another cell C ("Profit") that takes A and adds it to another cell B that adds up another row of data ("Expenses"). Now, if we change a value in any of the rows, all of the other rows are added up and we get the results in A and B updated automatically. We never had to write code that said something like "for each cell in row X, where...". In fact, we don't really care 
-					<span class="italic">how</span> our Spreadsheet program adds up the numbers -- it could have added them all up at once but in backward order, or stored a running total somewhere and updated just the difference in value for the cell we changed -- what we care about is 
-					<span class="italic">what</span> the result is, and whether it is correct.
-				</p>
-<p>But Actions are much more powerful than a spreadsheet, because what is flowing from Action A to Action B is not just a number, but any model component such as a space or a set of agents that we need to use in target actions.</p>
-</div>
-<div class="section" title="Concepts">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Concepts"></a>Concepts</h3>
-</div>
-</div>
-</div>
-<p>In this section, we'll describe how modelers can assemble actions into sets of behavior that accomplish complex tasks on interrelated agents and spaces over time.</p>
-<div class="section" title="Kinds of Actions">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Kinds_of_Actions"></a>Kinds of Actions</h4>
-</div>
-</div>
-</div>
-<table id="N1029B">
-<tr>
-							
-<td>Before getting into the details of how each Actions work together, or the various kinds of Actions, it will be helpful to take a broad overview of how they all fit together. As discussed above, actions are strung together in a sequence or flow. They're always composed of two parts, though those parts can be assembled and intermixed in many different ways. First, we search for a collection of agents, and then we do something with that selection. We refer to these two parts as Selections and Commands. (For the technically minded, another useful way of looking at the Actions approach is as a Query Transformation language, as with SQL and Stored Procedures.  Except again, the results of the queries along with the transformations flow through from one query to the next.) Selections find the agents we want to do something with, and the commands do it. We need some way to start the whole chain of actions off, and so we have a kind of Selection called a Root Selection, or simply a Root. Secondly, we need some way to actually make the agents exist in the model in the first place, so we have a Create Agents action. Finally, we have special commands called builders that allow us to create the spaces that the agents will occupy. The various actions are discussed in depth in the Details section.</td>
-							<td>
-								
-<div class="mediaobject">
-<img src="images/actions/ActionsBlocks.png"></div> 
-							
-</td>
-						
-</tr>
-</table>
-</div>
-<div class="section" title="Flow">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Flow"></a>Flow</h4>
-</div>
-</div>
-</div>
-<p>First, let's look at how actions define the basic path that agents take during a model run. As with any programming language, the path we take through the program specification is what determines our state when we get there. In a pure object oriented program, the path just defines the control flow -- what we are doing. The actual state of our model is defined within the object itself. If we call a method B from another method A, we'll be relying on method A to set the values that we need into the object state itself. In a purely functional program the path defines how we are going to deal with whatever has been explicitly passed in to a function that has been called, that is the function parameters. In fact, most languages such as Java combine aspects of both approaches.</p>
-<p>In Actions, the path itself implicitly carries all of the context of prior execution with it. This means that we don't have to worry about storing context in the object -- as we would in an object-oriented language -- or passing the correct values from one method call to the next as we would in a functional language. Instead, Actions can use the implicit context of the path of flow to determine what the current state of execution is.
-						An important aspect of the Actions design is that loop structures are not allowed -- that is, flows are acyclic. An action can never have an ancestor target (that is targets, targets of targets, etc..) that has as one of its ancestors that same action. As you'll see, actions don't typically 
-						<span class="italic">need</span> loop structures. By far the most common use of loops in conventional programming langauges is to loop through collections of objects. As selections (see below) refer to the entire collection of agents, any actions on a selection apply to all members of that collection. Recursive structures are needed for some particular usages and will be supported in future releases, but not through an explicit looping construct.
-					</p>
-<table id="N102B9">
-<tr>
-							
-<td>Again, behaviors in Actions are always defined by a set of 
-								<span class="italic">selections</span> and 
-								<span class="italic">queries</span>. In the diagram to the right, we can see the pattern. First, we define a Root Selection for a Rule, Schedule or other triggering event. Then, we might add a series of Query and Logic Actions to define the specific agents that we are interested in. These are all part of the Selection. Next, we might define a series of Commands to determine what to do with those agents. Or, we could use the result of that selection to immediately define another selection, for example if we are searching for an agent that is near another agent.
-							</td>
-							<td>
-								
-<div class="mediaobject">
-<img src="images/actions/ActionsSequence.png"></div>
-							
-</td>
-						
-</tr>
-</table>
-<table id="N102D3">
-<tr>
-							
-<td>The diagram to the right depicts a simple example. Here, we create a rule, and then check the results of two queries. For any agents that meet those criteria, we'll evaluate some function based on their state, and then set some value on them.</td>
-							<td>
-								
-<div class="mediaobject">
-<img src="images/actions/ActionsSimpleSequence.png"></div>
-							
-</td>
-						
-</tr>
-</table>
-<table id="N102E5">
-<tr>
-							
-<td>In this next example, we'll first create the rule, and then create a new selection with a set of criteria. Finally, we'll do a move based on those queries.</td>
-							<td>
-								
-<div class="mediaobject">
-<img src="images/actions/ActionsSimpleSequence2.png"></div>
-							
-</td>
-						
-</tr>
-</table>
-<p>In the following example, we've defined a set of actions and their relationships. We have a selection, a few queries and a couple of logic operators leading to a Set Action. We'll describe in detail below how Logic Actions are used in conjunction with other actions to assemble any kind of query structure needed. But for now, we'll focus on the control flow itself.</p>
-<p>
-						
-</p>
-<div class="mediaobject">
-<img src="images/actions/ActionsFlowSimple.png"></div>
-<p>
-					
-</p>
-<p>As you have probably already guessed, the agents that have the Set Action applied to them could take one of two paths through the Action flow. Readers with experience with programming or formal logic will note that this looks just like a parse tree, and while that's basically what it is, there are important differences. For example, if we looked at the following structure as a definition of control flow for a single agent we'd take them to be equivalent. Both would evaluate the statement (Query 1 AND Query 2) OR Query 3 for each agent.</p>
-<p>
-						
-</p>
-<div class="mediaobject">
-<img src="images/actions/ActionsFlowUnion.png"></div>
-<p>
-					
-</p>
-<p>Within Actions in many cases these two approaches will also act equivalently. If we are simply setting a value, it doesn't matter how an agent gets to that Set Action, as long as it gets there. All sources that flow into a given target Action act like a logical union since any of the paths might reach that target. But note that we have two flows moving in parallel in the flow on the right. What happens when the conditions for 
-						<span class="italic">both</span> branches are true? As the set of agents flow through each branch the Set Action on the left will be evaluated once, while the one on the right will be evaluated twice. Again, this often ends up with the same behavior, but not always. If for example, the evaluate Action uses the value of the attribute that we are setting as input, we can get different results. Of course, you can write code in any language that accomplishes the same thing, but the code will look quite different. For example, if we wrote the same basic logic in Java, in the first case we'd have something like:
-					</p>
-<div class="literallayout">
-<p>if&nbsp;((query1.evaluate()&nbsp;&amp;&amp;&nbsp;query2.evaluate())&nbsp;||&nbsp;query3.evaluate())&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;doSomething();<br>
-}<br>
-
-</p>
-</div>
-<p>In the second we'd have:</p>
-<div class="literallayout">
-<p>if&nbsp;(query1.evaluate()&nbsp;&amp;&amp;&nbsp;query2.evaluate())&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;doSomething();<br>
-}<br>
-if&nbsp;(query3.evaluate())&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;doSomething();<br>
-}<br>
-
-</p>
-</div>
-<p>This is a simple example, but with multiple branches such code design issues can quickly grow complex. The flow approach allows us to express things in a way that is often more natural and expressive. The important thing to keep in mind when desiging action flows is to see the flow as representing a selection of agents moving through streams independently. In the Actions example we expressed both approaches in nearly the same way, except in the case on the left we used a Union Action to bring the two branches of flow back together.</p>
-</div>
-<div class="section" title="Selections">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Selections"></a>Selections</h4>
-</div>
-</div>
-</div>
-<p>Selections are a key concept in Actions. Put simply, selections define what we are searching for and where. They are defined by a combination of Select, Query and Logic Actions. Each time we create a new Select Action, we define a new selection. Queries can be used to further refine selections either immediately after or later in the Action flow, as described in the next section. Logic Actions are used to combine and organize the Action flow defined by Query Actions. In order to understand how these three pieces work together, we need to understand the idea of selection boundaries.</p>
-<table id="N10321">
-<tr>
-							
-<td>A selection boundary determines the set of selection actions that are used to determine what agents to apply target actions to. For example, in the following diagram, we can see the extent of the boundary for a straightforward selection.</td>
-							<td>
-								
-<div class="mediaobject">
-<img src="images/actions/ActionsSelBoundarySimple.png"></div>
-							
-</td>
-						
-</tr>
-</table>
-<table id="N10333">
-<tr>
-							
-<td>Each time we create a new selection, we define a new set of boundaries. In the diagram to the right, Selection 1 and Selection 2 eaach start with a new Select Action. </td>
-							<td>
-								
-<div class="mediaobject">
-<img src="images/actions/ActionsSelBoundary2Parts.png"></div> 
-							
-</td>
-						
-</tr>
-</table>
-<p>But boundaries can be defined for a group of actions by a Query Actions as well. This is because Query Actions can be directly part of a selection definition, but they can also refine selections. We'll see how that works below. So where does one selection boundary end and the next one begin? The simple rule is that the end of the boundary is defined for a given Action by the place where:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="1">
-<li class="listitem">
-<p>A Query Action is not followed by a Logic Action, or</p>
-</li>
-<li class="listitem">
-<p>A Logic Action is not followed by another Logic Action</p>
-</li>
-</ol>
-</div>
-<table id="N10350">
-<tr>
-							
-<td>In other words, as soon as a Logic Action occurs in a path leading to an Action, any following Query will define a new boundary, as shown in the example to the right. </td>
-							<td>
-								
-<div class="mediaobject">
-<img src="images/actions/ActionsSelBoundary11A.png"></div>
-							
-</td>
-						
-</tr>
-</table>
-<p>Note that we refer to "Selection 1" and Selection 1A". This is because Selection 1A is a refinement of Selection 1 along its particular path of flow. When a query appears for the same selection but past a particular boundary, you can think of it as a sort of filter on the selection contents. We don't have a "Selection 2" here because any Actions that refer to "Selection 1" along the current path of flow will be acting on the selection defined by Selection 1 and Selection 1A.</p>
-<p>These rules allow actions to be defined in the simplest possible way, but it is important to understand their implication as they result in behavior that can be different from what someone used to and imperative programming environment such as Java might expect. In a simple case the distinction might not matter. For example, if we are using a Query 1 to test whether an agent's attribute a == x and attribute b == y, we would get the same outcome if we placed intersected the queries as if we simply put them in sequence. Internally we would actually be searching for agents with a == x, and 
-						<span class="italic">then</span> taking those agents and choosing those agents with b==y, but the outcome would be the same. But consider a more sophisticated case, where we are searching for neighboring available cells.
-					</p>
-<p>
-						
-</p>
-<div class="mediaobject">
-<img src="images/actions/ActionsSelBoundaryComplex.png"></div>
-<p>
-					
-</p>
-<p>In the first case, we execute a search for all agents that meet the two criteria. This means that if there are 
-						<span class="italic">any</span> neighboring cells which are available, we're guaranteed to find one (random) cell. In the second case, we first search for all cells that are neighbors. This will match any agents that include both available and non available agents. Now, at this point since our search returns one agent (in the current AMF design -- richer behavior will be supported in the future) the randomly selected agent could be either available or not. So in the second case, we might end up with no cell to move to, and thus make no move at all. This then becomes an important aspect of model design. For example, if one were defining a model where neighbors played a game with each other, one might want to instruct agents to play the game only with neighbors that have a certain wealth threshold. In the real-world situation that we are modeling, we might simply search for neighbors who are over a given wealth threshold and then play the game with them. This would imply that information about other agent's wealth is open knowledge. Or, we might simply select a random neighbor, and ask that neighbor to play a game with us. Upon discovering that our neighbor does not meet our wealth criteria, we would then choose not to play with them. Here we are modeling a cost in time to obtain information about another agent's wealth, because we might miss an opportunity to play the game with another agent on that round.
-					</p>
-</div>
-<div class="section" title="Weaving">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Weaving"></a>Weaving</h4>
-</div>
-</div>
-</div>
-<table id="N1037B">
-<tr>
-							
-<td>Now, let's put the concepts of Actions sequences and boundaries together to see how we can easily define complex interactions between multiple selections. When we define a Select, the state of its selection flows through and with any subsequent selections. So for example, if we have a Root Action rule, and then do a selection based on it, we'll have access to the agent from the original context as well as all of the subsequent selections. We can refer to any previous selection for any subsequent action. For example, instead of setting the value for the rule agent, we might instead set a value for an agent we've found in a target selection.</td>
-							<td>
-								
-<div class="mediaobject">
-<img src="images/actions/ActionsWeavingSetAnother.png"></div>
-							
-</td>
-						
-</tr>
-</table>
-<table id="N1038D">
-<tr>
-							
-<td>Inputs to functions also use selections. (We'll discuss more details in the functions section.) In the following example, we're adding the wealth of the Selection 1 agent to the wealth of the Selection 2 agent and using that value to set some other value. (Here, perhaps we are modeling an agent in a winner takes all game, in which case we'd also add a Set Action on Selection 2 and set the second agent's wealth to 0.)</td>
-							<td>
-								
-<div class="mediaobject">
-<img src="images/actions/ActionsWeavingEvaluate.png"></div>
-							
-</td>
-						
-</tr>
-</table>
-<table id="N1039F">
-<tr>
-							
-<td>But we can also use selections in defining Query Actions themselves. So in the following example, we select a neighbor agent and then compare the age of our Rule agent with the age of the Selection 2 agent. If and only if those ages are the same will we execute the target Set Action. This example also demonstrates why we refer to the data flow as weaving. Query Actions can be used to refine selections at any point in the data flow. Selections and their uses are interwoven throughout an action sequence.</td>
-							<td>
-								
-<div class="mediaobject">
-<img src="images/actions/ActionsWeaving1A.png"></div>
-							
-</td>
-						
-</tr>
-</table>
-<table id="N103B1">
-<tr>
-							
-<td>Finally, we can put all of these concepts together by weaving selections together with flows. As we discussed in the flow section, if we use multiple paths in the Query, the agents that flow through from any prior Query can follow multiple paths at once. And as we discussed in the selection section, the selection and its boundaries determine what agents we will be working with at any given evaluation point in the flow. Consider the example to the right. As we'll see in the detailed explanation of each Action below, Transformation Actions such as Move or Connect take multiple selections. The first selection defines the set of agents that will be performing the action. In the case of a Move agent, this refers to the mover. The second selection, which for Move we call "destination", refers to the selection that will be receiving the action. In the case of movement this is the agent or location that the Rule agent will be moving to. If we follow the flows through, we can note two important outcomes of our model design -- a Rule agent might move twice if it meets the criteria for both the blue path and the red path and that it might move to a different location each time.</td>
-							<td>
-								
-<div class="mediaobject">
-<img src="images/actions/ActionsWeaving2.png"></div>
-							
-</td>
-						
-</tr>
-</table>
-</div>
-</div>
-<div class="section" title="Details">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Details_3"></a>Details</h3>
-</div>
-</div>
-</div>
-<table id="N103C7">
-<tr>
-						
-<td>In this section, we'll dig into the specific role of each of the Actions. From the design discussion we hopefully have some sense of how these all fit together in general. Again, the block diagram to the right provides an overview of how the various actions are related. You might want to take a look at the meta-class diagrams in the referernce section as well.</td>
-						<td>
-							
-<div class="mediaobject">
-<img src="images/actions/ActionsBlocks.png"></div> 
-						
-</td>
-					
-</tr>
-</table>
-<div class="section" title="Selections">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Selections_2"></a>Selections</h4>
-</div>
-</div>
-</div>
-<p>A selection defines a particular set of agents that we want to do something with. Selections are made up of the Select action itself, along with Query and Logic actions. When we refer to a selection in any target command, we are referring to the selection in the context of where we have defined the behavior.</p>
-<div class="section" title="Select">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Select"></a>Select</h5>
-</div>
-</div>
-</div>
-<p>As we discussed above, when we refer to a Select, we're actually referring to the selection as a whole leading up to the current action. The Select Action itself is used to define what we are searching for (Agent), where we are searching for it (Space), and from whose perspective we are doing it (Selection). Create Actions are a sepecial kind of Select Action that are used to create agents. See the decription in the Builders section below for more information.</p>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>The selection that we are searching "from". This seems to be the concept that new users have the most difficulty with, but it is key to understanding how Actions works. Just as with any other Action -- a Move command for example -- a selection needs to know what set of agents that it is working with. For example, if we want to define a selection B that finds the cells neighboring a rule B's agent, we would set selection B's selection to A.</p>
-</div>
-<div class="section" title="Agent">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Agent"></a>Agent</h6>
-</div>
-</div>
-</div>
-<p>Here we define what agent we will be looking for. In order for this to make sense, the agent has to be related in some meaningful way to the agent whose behavior we are defining. For example, it might be a partner agent or a location that we might want to move to. An agent must be specified unless we are searching within a continuous space, in which case this value should be empty, and the result of the selection will represent some location in that space. In the current version of the framework, we treat destination cell locations as agents, and require that location to be specified as a target agent, but in a future version we'll allow searches without defining an agent within grid spaces as well.</p>
-</div>
-<div class="section" title="Space">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Space"></a>Space</h6>
-</div>
-</div>
-</div>
-<p>The space that we want to search within. Of course, this must be specified if we use any spatial query terms (see below), but if we simply want to search across all agents it should not be specified.</p>
-<p>Represent Queries (Controls) on agents and Transformations, or Commands, on the result of those queries. Queries, Transformations and other  in which each child target carries the execution and data context for it's particular path.</p>
-</div>
-<div class="section" title="For">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="For"></a>For</h6>
-</div>
-</div>
-</div>
-<p>This value is obsolete and will be replaced with a different mechanism in the next version of the modeling environment.</p>
-</div>
-</div>
-<div class="section" title="Query">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Query"></a>Query</h5>
-</div>
-</div>
-</div>
-<p>A Query represents a concrete criteria for our search. The name is a bit confusing because of potential for confusion with a generic query. Queries -- along with their cousin Evaluators -- define a function that is evaluated and that can take Agent attributes and the results of other Actions as input. Queries are combined with each other and with the logic actions to determine the results of a selection for their direct target actions. </p>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_2"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>As with all other actions, evaluations specify a selection, and just as with the other actions, this determines the set of agents that the evaluation occurs for, but the input selections determine what agent is used for the calculation itself.</p>
-</div>
-<div class="section" title="Function">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Function"></a>Function</h6>
-</div>
-</div>
-</div>
-<p>A query function is evaluated to determine the results of a particular selection. Functions can represent very simple search criteria such as "My Age == Your Age", but they can also represent complex and inter-related concepts such as spatial relationships. They must return logical values. See the functions section for more information on specific functions.</p>
-</div>
-<div class="section" title="Inputs">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Inputs"></a>Inputs</h6>
-</div>
-</div>
-</div>
-<p>The set of values that will be used to determine the result, in the order specified by the function prototype. Inputs can specify any source evaluation and any agent state or agent parent context state. They can also be literal values -- see the section on literals below. The selection determines which agent's will be used to determine the value, and different inputs can specify different selections.</p>
-</div>
-</div>
-<div class="section" title="Logic">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Logic"></a>Logic</h5>
-</div>
-</div>
-</div>
-<p>These Actions provide us with the ability to combine queries with one another, and follow the basic rules of set logic. But as we've seen above, it is important to understand that there are important differences between Logic Actions and typical programming logic. Most importantly, they apply not to individual agents per se, but to the set of agents that move through them. Also, there is not neccesarily short circuit execution (it's not needed) and much richer criteria can be joined together because of the action flow design.</p>
-</div>
-<div class="section" title="Intersection">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Intersection"></a>Intersection</h5>
-</div>
-</div>
-</div>
-<p>An intersection contains only those agents that match all of its source actions. This is essentially equivalent to a logical AND statement and has similarities to an &amp;&amp; operator in a java "if" statement. An agent must be able to flow through all incoming actions in order to flow out of an Intersection Action.</p>
-</div>
-<div class="section" title="Union">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Union"></a>Union</h5>
-</div>
-</div>
-</div>
-<p>A union contains all agents that match any of its source actions. This shares similiarities to a logical OR statement and the || operator in a java "if" statement. It does mroe than that however, as it acts to join multiple flows of action. That is, as set logic implies, an agent will never appear in the result of a union more than once.</p>
-</div>
-<div class="section" title="Difference">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Difference"></a>Difference</h5>
-</div>
-</div>
-</div>
-<p>A difference contains all agents that do not match any of its source actions. This essentially equivalent to a logical NOT statement, and has similarities to the Java else statement. Like the Union Action, difference implies that a given agent will only appear once in any subsequent targets. No agents that reach a Difference Action will flow through to the next action(s), and all agents (that meet the definition of the Select Action) that cannot reach that action will.</p>
-</div>
-</div>
-<div class="section" title="Roots">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Roots"></a>Roots</h4>
-</div>
-</div>
-</div>
-<p>Root actions are a special case of a selection. These represent behaviors that are defined for all members of agents; these are the highest granularity of an agent's behavior, such as "Find Partners" or "Eat" or "Reproduce". When you want to create a new set of Actions, you have the following choices.</p>
-<div class="section" title="Build">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Build"></a>Build</h5>
-</div>
-</div>
-</div>
-<p>The Build Action is a specialized action that allow the construction of member agents and spaces within a parent context. A Build Action executes once for each context before any initialization actions occur for any children agents of that context. Currently it is undefined whether a context's own Initialize Action is executed before the Build Action occurs, so implementors should not rely on any initialized values being available at build time.</p>
-</div>
-<div class="section" title="Initialize">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Initialize"></a>Initialize</h5>
-</div>
-</div>
-</div>
-<p>An Initialize action is executed once and only once for every agent when the model is first started -- at time 0. Initialize Actions are guaranteed to execute before any other non-builder action occurs.</p>
-</div>
-<div class="section" title="Rule">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Rule"></a>Rule</h5>
-</div>
-</div>
-</div>
-<p>A Rule executes once for every agent for every iteration of the model. An important note is that the actual sequence of rules is technically undefined. An implementor should not rely on the fact that a rule occurs before another rule in the list of agent actions though typically the order in which the rules were actually created is respected.</p>
-</div>
-<div class="section" title="Schedule">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Schedule"></a>Schedule</h5>
-</div>
-</div>
-</div>
-<p>A schedule is executed on a recurring basis, according to the values detailed below. Note that schedules are often overused. In most agent-based models it makes sense to have any behaviors occur at the same granularity using a Rule. Please note that Schedules are not currently supported in the Escap target, but that support should be available soon. In the following descriptions we refer to period as the current iteration of the model, that is where time == t.</p>
-<div class="section" title="Start">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Start"></a>Start</h6>
-</div>
-</div>
-</div>
-<p>The period that the schedule will first be invoked. For example, if this value is 100, and interval is 1, the schedue will be executed at times 100,101,102..</p>
-</div>
-<div class="section" title="Interval">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Interval"></a>Interval</h6>
-</div>
-</div>
-</div>
-<p>How often the schedule is invoked. For example, if this value is 3 and start is 1, the schedule will be executed at times 1,4,7..</p>
-</div>
-<div class="section" title="Priority">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Priority"></a>Priority</h6>
-</div>
-</div>
-</div>
-<p>Where the rule will be placed in the execution queue for a given time period. For example, if Schedule A's priority is set to 3 and Schedule B's is set to 2, Schedule B will be executed for all agents before Schedule B is executed for any agents.</p>
-</div>
-<div class="section" title="Pick">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Pick"></a>Pick</h6>
-</div>
-</div>
-</div>
-<p>Controls how many agents to execute the schedule against. While this value will have an effect on the Repast target, it is not recommended to be used for general models and is likely to be replaced by another approach.</p>
-</div>
-</div>
-<div class="section" title="Watch">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Watch"></a>Watch</h5>
-</div>
-</div>
-</div>
-<p>A Watch action is executed any time the watched value is set for any agent. Note that the Action will be triggerred even if the state is simply set back to the value that it already has. It is important to be careful about creating Watches that might set the values of other Watch actions which might in turn trigger this watch. To clarify, if a modeler creates a Watch A for attribute a, and creates a target Set for it for attribute b, and Watch B is watching attribute b, then if Watch B has a target Set for attribute A, a circular execution could occur. This would cause the model to get stuck in its current iteration. To help model developers avoid this case, a warning will be provided if such a set of circular watch dependencies is created.</p>
-<div class="section" title="Attribute">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Attribute"></a>Attribute</h6>
-</div>
-</div>
-</div>
-<p>The attribute that will be monitored for change.</p>
-</div>
-</div>
-</div>
-<div class="section" title="Builders">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Builders"></a>Builders</h4>
-</div>
-</div>
-</div>
-<p>Builders are a special category of actions that are used to create spaces. They should not be confused with the Build Action itself which is a root selection that defines the time at which builder actions should occur. Generally speaking, specific Builder Actions for spaces and Create Actions for agents are targets of Build Actions.</p>
-<div class="section" title="Create Agents">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Create_Agents"></a>Create Agents</h5>
-</div>
-</div>
-</div>
-<p>Agents are crete using the Create Agent action. The Create Agent Action is actually a special kind of Select Action that is used to actually create agents rather than simply search for them. Other than this capability, a Create Agent action can be used just like any other action except that Query and Logic actions aren't needed or genrally appropriate as this action defines a set number of agents to perform an action against. Create Agent actions have the special feature of being usable from the containing context, so that contexts can create initial agent populations before any agents exist within the context to perform actions against. But they can also be used directly within agent rules, for example to create a child agent as the result of a reproducation rule. Note that Initialize Actions are 
-							<span class="italic">not</span> performed on agents that have been created within a model during regular (non-initialization time) execution. If the model creates actions during the regular model run, any state initialization should be handled by the targets of this action directly. (Naturally, if the enclosing context is used to create agents at the beginning of a model run, then the Initialize action is used as part of the normal model life-cycle.)
-						</p>
-<div class="section" title="Agent">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Agent_2"></a>Agent</h6>
-</div>
-</div>
-</div>
-<p>The kind of agent to create.</p>
-</div>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_3"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>The selection to use as the basic for this selection. This is generally not important except to define control flow.</p>
-</div>
-<div class="section" title="Space">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Space_2"></a>Space</h6>
-</div>
-</div>
-</div>
-<p>Not generally relevant for agent actions, as agents are not placed into a space unless explicitly moved to that space. Potential associations between agents and spaces are defined by the space building actions.</p>
-</div>
-<div class="section" title="Agent Count">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Agent_Count"></a>Agent Count</h6>
-</div>
-</div>
-</div>
-<p>The number of agents to create. If used as part of an enclosing context's Initialize Action(s) an Attribute parameter will automatically be created. If not, then an evaluation or agent attribute should be used to define this number.</p>
-</div>
-<div class="section" title="For">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="For_2"></a>For</h6>
-</div>
-</div>
-</div>
-<p>Deprected. Should not be used.</p>
-</div>
-</div>
-<div class="section" title="Create Shaped Agent">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Create_Shaped_Agent"></a>Create Shaped Agent</h5>
-</div>
-</div>
-</div>
-<p>Creates an agent that has a particular shape extent within some continuous (i.e. vector as opposed to raster) space. This action performs just like a Create Action except for the following attribute:</p>
-<div class="section" title="Shape">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Shape"></a>Shape</h6>
-</div>
-</div>
-</div>
-<p>Determines how each agent's spatial extent will be defined. The actual form of that shape is implementation specific. For example, in a GIS space (the immediate rationale for this Action) a polygon represents a region on a map and the extent of that shape might be determined by a .shape file. The available shape types are:</p>
-<div class="variablelist">
-<dl>
-<dt>
-<span class="term">Point</span>
-</dt>
-<dd>
-<p>A simple point in space, fully equivalent to a standard continuous space location.</p>
-</dd>
-<dt>
-<span class="term">Line</span>
-</dt>
-<dd>
-<p>A single line within a continuous space. Technically this represents a line segment as it is expected to have a beginning and ending point. In the future, this might refer more generically to planes in three dimensional space and hypersurfaces in n-dimensional spaces, but this is currently not supported by any AMF target implementations.</p>
-</dd>
-<dt>
-<span class="term">Polygon</span>
-</dt>
-<dd>
-<p>A region within a space defined by an arbitrarily large set of line segments. Potentially this could be used to refer to polyhedrons in three-dimeensional space, or even more genrally as polytopes, but this is currently not supported by any AMF target implementations.</p>
-</dd>
-</dl>
-</div>
-</div>
-</div>
-<div class="section" title="Load Agents">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Load_Agents"></a>Load Agents</h5>
-</div>
-</div>
-</div>
-<p>Imports and creates a set of agents from some input file. The actual form and manner of the import is implementation specific but should be inferrable from any source file based on the URL provided, assuming that the target platform or the AMF platform supports the appropriate imput type. For example, a Tab-CR delimited file might be used to populate a set of agents with various attributes. Additional meta-data could be provided by the URL, but we will likely add additional extensible meta-data to this action to better support the definition of expected input types and routines from within an AMF model itself. This action is equivalent to the Create Agents action except for:</p>
-<div class="section" title="Source URL">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Source_URL"></a>Source URL</h6>
-</div>
-</div>
-</div>
-<p>The location of the input file or set of meta-data used to determine the location and type of the input file.</p>
-</div>
-</div>
-<div class="section" title="Load Shaped Agents">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Load_Shaped_Agents"></a>Load Shaped Agents</h5>
-</div>
-</div>
-</div>
-<p>Combines the properties of the Create Shaped Agent and Load Agent Actions. The source url should of course specify an input format that supports the shape type specified. See the descriptions of the related actions for more details.</p>
-</div>
-<div class="section" title="Build Network">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Build_Network"></a>Build Network</h5>
-</div>
-</div>
-</div>
-<p>Creates a network, i.e. a graph structure, supporting the establishment of edges between arbitrary nodes.</p>
-<div class="section" title="Agents">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Agents_3"></a>Agents</h6>
-</div>
-</div>
-</div>
-<p>Specifies the set of agents that can exist within this network. Agents must be included here in order for them to make connections within the network but agents included here are not required to have connections within the network, nor are such connections created for them. (See important note regarding network types below.)</p>
-</div>
-<div class="section" title="Attributes">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Attributes_3"></a>Attributes</h6>
-</div>
-</div>
-</div>
-<p>Not currently used for networks.</p>
-</div>
-<div class="section" title="Network Type">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Network_Type"></a>Network Type</h6>
-</div>
-</div>
-</div>
-<p>Deprecated. This feature is only currently supported for Repast targets and is likely to be removed from future versions of the AMF meta-model. Future AMF implementations are likely will provide a different mechanism for instantiating and importing network structures either within the network defintion or through other Action definitions. Instead of using this feature, modelers should create specific networks by building them up with Connect Actions for indivdual agents. For example to create a small world netowrk, a modeler might create random links between agents and then replace or augment those connections.</p>
-</div>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_4"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>Not relevant for network builders except as part of normal control flow.</p>
-</div>
-</div>
-<div class="section" title="Build Grid">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Build_Grid"></a>Build Grid</h5>
-</div>
-</div>
-</div>
-<p>Creates a grid space.</p>
-<div class="section" title="Agents">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Agents_4"></a>Agents</h6>
-</div>
-</div>
-</div>
-<p>The set of agents that might exist as occupants of this grid; that is, members of individual cells within a given grid. Agents must be included here in order for instances to exist within the space, but agents included here do not actually have to exist within the space. (In the Repast implementation, all agents technically are memebers of the spatial projection, but are not required to have valid coordinates within that space.) For example, in an agriculture model these might represent agents moving about and harvesting plots of land.</p>
-</div>
-<div class="section" title="Fill Agent">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Fill_Agent"></a>Fill Agent</h6>
-</div>
-</div>
-</div>
-<p>The agent that will be used to populate the grid itself. A gird is guranteed to contain one and only one fill agent within each grid locaiton. The grid will be populated with instances of the specified agent and these agents cannot move, leave or die within this space. This value need not be specified -- if left blank a default cell without any state will be used. For example, in an agriculture model, this agent might represent a single plot of land.</p>
-</div>
-<div class="section" title="Space Type">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Space_Type"></a>Space Type</h6>
-</div>
-</div>
-</div>
-<p>Deprecated. Should not be used.</p>
-</div>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_5"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>Not relevant for builders except as part of normal control flow.</p>
-</div>
-<div class="section" title="Attributes">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Attributes_4"></a>Attributes</h6>
-</div>
-</div>
-</div>
-<p>Not currently used for spaces.</p>
-</div>
-</div>
-<div class="section" title="Build Space">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Build_Space"></a>Build Space</h5>
-</div>
-</div>
-</div>
-<p>Creates a continous space. The actual dimensionality and other qualities of the space are currently defined in the space itself though this might change in future versions. All other values are used in the same way as for the gird and other builder actions.</p>
-<div class="section" title="Agents">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Agents_5"></a>Agents</h6>
-</div>
-</div>
-</div>
-<p>The set of agents that might be a part of this space. Agents must be included here in order for instances to exist within the space, but agents included here do not actually have to exist within the space. (In the Repast implementation, all agents technically are memebers of the spatial projection, but are not required to have valid coordinates within that space.)</p>
-</div>
-</div>
-<div class="section" title="Build Geography">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Build_Geography"></a>Build Geography</h5>
-</div>
-</div>
-</div>
-<p>Constructs a geographical space. All details of this space are specfied by the implementation, i.e. a specific geographical imported space. Generally these would be defined by a Create Agents action; that is a set of imported agents representing US states would also represent the overall space of interest.</p>
-</div>
-</div>
-<div class="section" title="Commands">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Commands"></a>Commands</h4>
-</div>
-</div>
-</div>
-<div class="section" title="Evaluate">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Evaluate"></a>Evaluate</h5>
-</div>
-</div>
-</div>
-<p>Evaluate Actions define some calculation on a function based on the model state and a set of input(s). The inputs that an Evaluate Action can take is determined by its functions and can be either agent attributes, prior evaluations or literals. The result is then determined based on those inputs. In some cases Evaluate functions can be used to determine some action indirectly, such as with a graphics fill, but they can never be used to directly change model state.</p>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_6"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>As with all other actions, evaluations specify a selection, and just as with the other actions, this determines the set of agents that the evaluation occurs for, but the input selections determine what agent is used for the calculation itself.</p>
-</div>
-<div class="section" title="Function">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Function_2"></a>Function</h6>
-</div>
-</div>
-</div>
-<p>A with queries, a function is evaluated against its input set. Functions can represent simple operators as well as complex functions. See the functions section for more information on specific functions.</p>
-</div>
-<div class="section" title="Inputs">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Inputs_2"></a>Inputs</h6>
-</div>
-</div>
-</div>
-<p>The set of values that will be used to determine the result, in the order of the function prototype. Inputs can specify any source evaluation and any agent state or agent parent context state. They can also be literal values -- see the discussion in the Tools section. The selection determines which agent's will be used to determine the value, and different inputs can specify different selections.</p>
-</div>
-</div>
-<div class="section" title="Set">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Set"></a>Set</h5>
-</div>
-</div>
-</div>
-<p>The Set Action assigns some value to another value.</p>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_7"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>Here the selection refers to the agent that we want to change. This does not have to be the immediatily preceeding selection but can be any accessible selection.</p>
-</div>
-<div class="section" title="Attribute">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Attribute_2"></a>Attribute</h6>
-</div>
-</div>
-</div>
-<p>The attribute to modify. It must be a member of this action's agent or of that agent's parent context.</p>
-</div>
-<div class="section" title="Parameter">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Parameter"></a>Parameter</h6>
-</div>
-</div>
-</div>
-<p>The value to assign to the attribute. Here, we can use either another agent attribute, or the results of a source evaluation. </p>
-</div>
-</div>
-<div class="section" title="Move">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Move"></a>Move</h5>
-</div>
-</div>
-</div>
-<p>The Move Action causes an agent to change its location in some space or network. The agent will leave whatever location it was in before within the selection space, and move to its new destination.</p>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_8"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>As in any other action, the selection determines what agent is affected -- in this case the agent that is being moved.</p>
-</div>
-<div class="section" title="Destination">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Destination"></a>Destination</h6>
-</div>
-</div>
-</div>
-<p>Specifies the target agent or location for the movement.</p>
-</div>
-</div>
-<div class="section" title="Leave">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Leave"></a>Leave</h5>
-</div>
-</div>
-</div>
-<p>Causes the agent to leave a particular space.</p>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_9"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>The selection determines what agent will be leaving and what space the agent will be leaving. If the agent doesn't exist in that space nothing will happen.</p>
-</div>
-<div class="section" title="Destination">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Destination_2"></a>Destination</h6>
-</div>
-</div>
-</div>
-<p>The destination is irrelevant for a leave action and should not be specified.</p>
-</div>
-</div>
-<div class="section" title="Die">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Die"></a>Die</h5>
-</div>
-</div>
-</div>
-<p>Causes the agent to cease to exist within the model as a whole.</p>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_10"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>The selection determines what space the agent to remove.</p>
-</div>
-<div class="section" title="=Destination">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name=".3DDestination"></a>=Destination</h6>
-</div>
-</div>
-</div>
-<p>The destination is irrelevant in this case and will probably be removed.</p>
-</div>
-</div>
-<div class="section" title="Connect">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Connect"></a>Connect</h5>
-</div>
-</div>
-</div>
-<p>Connects two agents within a network space. This Action is not applicable for any other kinds of spaces. Note that unlike with other transformational commands, we do not use the destination space to determine the space that will be impacted by the Action. This provides a more efficient representation without any loss in generality, because it allows us to search for a source and target agent within other spaces and then create a connection without creating a separate selection. As the important structural feature of networks are the relationships themselves, not the nodes this provides a more direct way to specify these relationships.</p>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_11"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>The selection determines the agent that will be connected to another agent. In the case of a directed graph, this is the source node.</p>
-</div>
-<div class="section" title="=Destination">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name=".3DDestination_2"></a>=Destination</h6>
-</div>
-</div>
-</div>
-<p>The destination determines the agent that the selection agent will be connected to. In the case of a directed graph, this is the target node.</p>
-</div>
-<div class="section" title="Within">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Within"></a>Within</h6>
-</div>
-</div>
-</div>
-<p>Specifies the network that the connection will be created within.</p>
-</div>
-</div>
-<div class="section" title="Directed">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Directed_2"></a>Directed</h5>
-</div>
-</div>
-</div>
-<p>Determines whether the connection made is directed or not. If true, selections from source agents will include the target, but target agent selections will not include the source agents (unless they are connected through some other path).</p>
-</div>
-<div class="section" title="Disconnect">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Disconnect"></a>Disconnect</h5>
-</div>
-</div>
-</div>
-<p>Removes the connection between agents within a network space. See the description of the Connect Action for important details.</p>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_12"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>The selection determines one side of the agent relationship that will be disconnected.</p>
-</div>
-<div class="section" title="Destination">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Destination_3"></a>Destination</h6>
-</div>
-</div>
-</div>
-<p>The selection determines one other side of the agent relationship that will be disconnected.</p>
-</div>
-<div class="section" title="Within">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Within_2"></a>Within</h6>
-</div>
-</div>
-</div>
-<p>Specifies the network that the connection will be created within.</p>
-</div>
-</div>
-<div class="section" title="Replace">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Replace"></a>Replace</h5>
-</div>
-</div>
-</div>
-<p>Functions in the same way as a Connect Action excepth that all other connections to other agents will first be removed.</p>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_13"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>The selection determines the agent that will be connected to another agent. In the case of a directed graph, this is the source node.</p>
-</div>
-<div class="section" title="Destination">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Destination_4"></a>Destination</h6>
-</div>
-</div>
-</div>
-<p>The destination determines the agent that the selection agent will be connected to. In the case of a directed graph, this is the target node.</p>
-</div>
-<div class="section" title="Within">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Within_3"></a>Within</h6>
-</div>
-</div>
-</div>
-<p>Specifies the network that the connection will be created within.</p>
-</div>
-</div>
-<div class="section" title="Directed">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Directed_3"></a>Directed</h5>
-</div>
-</div>
-</div>
-<p>Determines whether the connection made is directed or not. See the Connect description for more details.</p>
-</div>
-</div>
-<div class="section" title="Other">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Other"></a>Other</h4>
-</div>
-</div>
-</div>
-<div class="section" title="Method">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Method"></a>Method</h5>
-</div>
-</div>
-</div>
-<p>The Method action supports inclusion of arbitrary code within a generated method. Generally, this will be Java code as all of the current target platforms are Java-based but there is no technical requirement that it must be. For example, if a target has been developed to produce code for Swarm running on an iPad (and no, there are no current plans to support such a thing, though it would certainly be cool!) then the modeler could define Objective C code for the method.</p>
-<p>Please note that the Method Action should be avoided whenever possible. You should consider using it only in the case where there doesn't appear to be a way to construct equivalent functionality using the native Actions framework, such as when interfacing with third party APIs.  The aim of Actions is to provide the most general support for Agent Modeling possible without compromising the core design. Any use of native Java code strongly limits the set of platforms that your model will be able to generate code for and prevents you from using the AMF edit tools to explore the model behavior. In the case where you wish to construct a model feature and believe that it isn't possible or practical to do it with Actions, please contact us (see support section) so that we can suggest how you can accomplish what you want within Actions. If that is not possible, we'll consider developing new features that will support what you want to do.</p>
-<p>On the other hand, you may simply wish to use the Agent Modeling Framework to build a scaffolding for your model -- perhaps using your own custom Java framework for example -- and Method would be a good way to accomplish that. Also, note there are a number of other approaches to mixing hand-crafted Java together with AMF generated code. Please see the Programmer's Guide section "Integrating Java and AMF Models" for more on that.</p>
-<p>If you do decide to use the Method Action, keep in mind the following design practice recommendations:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="1">
-<li class="listitem">
-<p>Keep your usage of external API references to a minimum. If you can use only code provied by the core Java classes as well as the Apache Collections library, your code should work on every current Java target. On the other hand, if you make use of a specific ABM platform APIs your code will obviously only compile and run against that target.</p>
-</li>
-<li class="listitem">
-<p>Code should be in the form of a method body, excluding the signature. A single Java method is created using this code body. There is no support for input parameters -- if you need access to evaluated values from source actions, create agent attributes for them, set their values for the selected agents, and use them as sources for your Method Action.</p>
-</li>
-<li class="listitem">
-<p>All Java class references should be fully qualified. For example, if you wish to use the eclipse Draw2D Graphics class, you should refer to "org.eclipse.draw2d.Graphics", not simply "Graphics". If classes are not fully qualified, you will recieve compile errors. You can usually easily fix these by selecting your source code directory and choosing 
-									<span class="bold"><strong>Source &gt; Organize Imports..</strong></span> but it prevents automatic code generation.
-								</p>
-</li>
-<li class="listitem">
-<p>The method interface has no support for code completion, syntax checking or other common Java development environment features. You can avoid code maintenance and even support targetting multiple APIs by using the following technique. From your method body, call a helper method in a seperate class. The referred class could use a static method call, or you could instantiate the class and call a method against it, passing in the agent class so that the helper class can reference the agent's state. For example, if you wanted to use some custom java code to import agents from a specialized input file, you could put the following code in the Method Action body for the root Context:</p>
-</li>
-</ol>
-</div>
-<div class="literallayout">
-<p>(new&nbsp;org.me.SpecialFileLoader()).load(this);<br>
-
-</p>
-</div>
-<p>Then create a new source directory in your project called "src" (
-							<span class="bold"><strong>New &gt; Source Folder...</strong></span>) and create the class for the specialized file loader including the following method:
-						</p>
-<div class="literallayout">
-<p>public&nbsp;void&nbsp;load(MyRootModel&nbsp;model)&nbsp;{...}<br>
-
-</p>
-</div>
-<p>This approach allows you to a) maintain the working code using the Java Development Environment, b) avoid changes to the Method Action within the model, and most importantly, c) allow other implementations of the code using multiple APIs. For example, if you need to create a specialized graphics routine, you could create seperate implementations for your Escape (Eclipse Draw 2D), Ascape (Java Swing), and Repast (Simphony API) and place them in the appropriate projects. As long as the different Java source files have the same names and signatures, they will all compile correctly and execute the appropriate behavior.</p>
-<div class="section" title="Selection">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Selection_14"></a>Selection</h6>
-</div>
-</div>
-</div>
-<p>The selection determines what Agent class the code will be created within and the set of agents the method will be called upon.</p>
-</div>
-<div class="section" title="Body">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Body"></a>Body</h6>
-</div>
-</div>
-</div>
-<p>The actual code to insert in the method body. See the detailed recommendations for code use above.</p>
-</div>
-<div class="section" title="Generate">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Generate"></a>Generate</h6>
-</div>
-</div>
-</div>
-<p>Determines wether the code is actually inserted. If this is false, a bare method body will be constructed instead. This can be useful if you wish to turn off method generation in certain model implementaitons without removing the actual code.</p>
-</div>
-</div>
-</div>
-<div class="section" title="Query and Evaluation Inputs">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Query_and_Evaluation_Inputs"></a>Query and Evaluation Inputs</h4>
-</div>
-</div>
-</div>
-<p>Query and Evaluation Actions are both "Sinks" which means that they are capable of containing inputs. When you select a function, the appropriate number of inputs will be created. After selecting a function, you can view and select the inputs. The choices for the inputs will be constrained by the type of the function and the other operands you've selected.</p>
-<div class="section">
-<div class="titlepage"></div>
-<div class="section" title="Input Literals">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="N1062F"></a>Input Literals</h6>
-</div>
-</div>
-</div>
-<p>Inputs can take literal values; that is values that you specify simply by entering them directly into the query. In general it is useful to think of literals as similar to local variables in a conventional programming language, whereas attributes are analogous to member variables. (And this is how they are represented in the generated Java code.) As with local variables in model code, literals are not recommended for any values that can change model behavior. The value cannot be easily accessed or changed by other model users. For greater transparency, you should instead create an Attribute with an appropriate default value, setting the "immutable" value to true. Still, literals can be useful for values that are special cases related to the evaluation or query, such as an input code, and for quickly prototyping functionality.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="section" title="Example">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Example"></a>Example</h3>
-</div>
-</div>
-</div>
-<p>In this section, we'll look at an example that should make clear how the basic Actions approach works in a model. Say we want to define a behavior like:</p>
-<div class="literallayout">
-<p>"Search&nbsp;for&nbsp;a&nbsp;random&nbsp;agent&nbsp;within&nbsp;my&nbsp;vision&nbsp;that&nbsp;is&nbsp;the&nbsp;same&nbsp;age&nbsp;as&nbsp;I&nbsp;am.&nbsp;Find&nbsp;a&nbsp;location&nbsp;next&nbsp;to&nbsp;that&nbsp;agent&nbsp;that&nbsp;is&nbsp;not&nbsp;already&nbsp;occupied&nbsp;and&nbsp;move&nbsp;to&nbsp;it."<br>
-
-</p>
-</div>
-<p>Here, we create a sequence of actions like so:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="1">
-<li class="listitem">
-<p>Select every agent for every period of the model. ("Find Partner" Rule)</p>
-</li>
-<li class="listitem">
-<p>For every member of that selection, search for other agents of the same age within vision distance. ("Partner" selection.)</p>
-</li>
-<li class="listitem">
-<p>From "Partners" find a random member and search for a neighboring locations. ("Partner Neighbor" selection.)</p>
-</li>
-<li class="listitem">
-<p>Finally, move the agent in "Find Partner" to the "Partner Neighbor" location.</p>
-</li>
-</ol>
-</div>
-<p>Now, notice that although it's convenient to speak as if there is only one "Find Partner" and one "Partner Neighbor" in step 4 above, in fact selections are flowing through for each of the results of each of the previous action sequences, and we can refer to each of the directly. We could represent these behaviors in many different ways. For example, we might want to specify the model in a (hand-drawn) graphical language or in a (made-up) textual language:</p>
-<p>
-					
-</p>
-<div class="mediaobject">
-<img src="images/actions/ActionsExample.png"></div>
-<p>
-				
-</p>
-<p>This is how it looks in an actual model:</p>
-<p>
-					
-</p>
-<div class="mediaobject">
-<img src="images/actions/ActionsExampleNew.png"></div>
-<p>
-				
-</p>
-<p>And here is how this works in detail:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="1">
-<li class="listitem">
-<p>Create a Rule that will trigger the behavior. In this case, we want this rule to apply to all "Individual" agents within the model. (Space isn't relevant in this case.</p>
-</li>
-<li class="listitem">
-<p>Create a child Select Action that will find our partner. Two important things to note here:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="a">
-<li class="listitem">
-<p>The selection occurs based on the "Find Partner" selection. This means that for each Individual in the model, we'll be searching from the point of view of that agent to some other selection of agents.</p>
-</li>
-<li class="listitem">
-<p>We also need to define what type of agent we want and in this case the space does matter. We want to find an agent that is nearby within the City space. If instead we wanted to find a partner in a social network, we'd specify that instead.</p>
-</li>
-</ol>
-</div>
-</li>
-<li class="listitem">
-<p>Create two child Query Actions:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="a">
-<li class="listitem">
-<p>We want to search for someone who is the same age as us. This highlights the importance of the idea of the Selection in the Actions design. We're qualifying Age by the rule agent's partner for the first input and by the rule agent for the second. The selection carries throughout the flow of execution and this context is an explicit part of the entire structure. Note that this is very different from the way control flow works in a traditional imperative language such as Java.</p>
-</li>
-<li class="listitem">
-<p>We also want to search using a function for nearness, "within", which takes a parameter of vision. Note that the spatial functions are all polymorphic -- if we decided later on that we would rather search within say "Kevin Bacon space", that is a graph structure representation of space, we would only need to change the space we've defined in Select Partner.</p>
-</li>
-</ol>
-</div>
-</li>
-<li class="listitem">
-<p>Intersect the results of these two query components. This delineates the end of the selection definition for any target Actions.</p>
-</li>
-<li class="listitem">
-<p>Select a neighbor. Again, we can see the importance of Selections. Here, we are selecting from the point of view of the partner, not the initial agent that the current Rule is being executed for. Note that this time our target agent is a "Block", that is, a location within the city.</p>
-</li>
-<li class="listitem">
-<p>As above, define some queries. This time we want only those agents that are:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="a">
-<li class="listitem">
-<p>available, and</p>
-</li>
-<li class="listitem">
-<p>neighbors of our partner.</p>
-</li>
-</ol>
-</div>
-</li>
-<li class="listitem">
-<p>And another intersection..</p>
-</li>
-<li class="listitem">
-<p>Finally, we move to the location we've found. All that's required at this point is to specify:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="a">
-<li class="listitem">
-<p>The movement selection, or those agents that are moving, which in this case is the original agent we're executing the rule for, and</p>
-</li>
-<li class="listitem">
-<p>The destination, which is the cell that we've found. Note that the framework infers from the space definition that the Block agent is capable of hosting the Individual.</p>
-</li>
-</ol>
-</div>
-</li>
-</ol>
-</div>
-</div>
-<div class="section" title="Reference">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Reference_2"></a>Reference</h3>
-</div>
-</div>
-</div>
-<div class="section" title="Diagrams">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Diagrams_2"></a>Diagrams</h4>
-</div>
-</div>
-</div>
-<p>The following diagram may be helpful to readers familiar with UML and Meta-modeling:</p>
-<div class="section" title="Meta-Classes">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Meta-Classes_2"></a>Meta-Classes</h5>
-</div>
-</div>
-</div>
-<p>
-							
-</p>
-<div class="mediaobject">
-<img src="images/actions/ActionsDiagram.png"></div>
-<p>
-						
-</p>
-</div>
-<div class="section" title="Details">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Details_4"></a>Details</h5>
-</div>
-</div>
-</div>
-<p>In the diagram above, all meta-objects except for Input, Literal, and the enumerators (lists of options) are Actions. Blue meta-classes are concrete (you can create and use them directly). Red meta-classes are key collaborations.</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="1">
-<li class="listitem">
-<p>An Act is anything that might happen during the execution of an Agent-Based Model.</p>
-</li>
-<li class="listitem">
-<p>All Actions have as their root-most source action a Root. These are added first to any agent behavior and act as triggers for all target behavior. For example, a Watch will execute any time the watched attribute is modified. (As the diagrams do not refer to elements outside of the current package, we cannot see here that Accessor includes a reference to some Attribute, but it does. To see these kinds of relationships you will want to refer to the metaabm.ecore file itself.)#Actions are targets and sources of one another, but an Act can never have itself as a source. (That is, Actions are acyclic, but branches can re-converge. When we refer to an Act source or target, we typically mean to include all ancestors or descendants, not just the immediately connected Act.)</p>
-</li>
-<li class="listitem">
-<p>All Actions (except for root Actions) reference a Select, referred to as the "selected" relation. An ASelect represents the model aspects that the Act is working within; that is, the spatial, temporal and type (agent) "world" that is currently being selected.</p>
-</li>
-<li class="listitem">
-<p>Commands trigger some model state change (Set) or spatial transformation (Transform).</p>
-</li>
-<li class="listitem">
-<p>Controls determine whether target Actions are executed and against what agents. They are in some sense query terms and include Query actions and Logic Actions.</p>
-</li>
-<li class="listitem">
-<p>Transforms also specify a "destination" Select. This represents aspects that the selected agent(s) will transform to. For example, a Move may use a Rule to select all SugarAgents (type) in the SugarGrid (space) every period (time) and move them to a destination of a neighboring SugarCell (type) in the SugarGrid (space, with time implicit).</p>
-</li>
-<li class="listitem">
-<p>Sinks are Actions which use some Function (see next section) to interpret state in the form of Inputs. Inputs can come from selected agent attributes, other Actions, or literal values.</p>
-</li>
-</ol>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="section" title="Functions">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Functions"></a>Functions</h2>
-</div>
-</div>
-</div>
-<div class="section" title="Overview">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Overview_4"></a>Overview</h3>
-</div>
-</div>
-</div>
-<p>Functions are relatively simple in terms of model design, but we need to understand how particular functions work in order to develop models. Functions are divided in two ways. By type:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="1">
-<li class="listitem">
-<p>Operators are simple calculations sharing the same type.</p>
-</li>
-<li class="listitem">
-<p>Functions that can represent any general function that takes some well-defined input(s) and returns some well-defined output(s).</p>
-</li>
-</ol>
-</div>
-<p>And by usage:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="1">
-<li class="listitem">
-<p>Generics can return any value and are used in Evaluate actions.</p>
-</li>
-<li class="listitem">
-<p>Logicals return some boolean result and are used by Query actions to decide whether target Actions apply to a particular selection, and by Evaluate actions just as with any other functions. Input types should be defined as generally as possible.</p>
-</li>
-</ol>
-</div>
-<p>These overlap, so we have operators, logical operators, functions and logical functions. Functions are also divided into categories. We'll go through each of these in depth below.</p>
-<p>The most important thing to point out about functions is that - as we've seen with other Acore concepts -- they provide richer sets of functionality than traditional approaches. Many functions are designed to collaborate with one another as we'll see when looking at Spatial and Graphical functions. Functions can also trigger the creation of related model artifacts as we'll see with the Distribution functions.</p>
-<p>A technical note: conceptually, functions can return multi-values, but that is not currently implemented in the reference targets because of limitations of the target language Java.</p>
-</div>
-<div class="section" title="Details">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Details_5"></a>Details</h3>
-</div>
-</div>
-</div>
-<div class="section" title="General Functions">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="General_Functions"></a>General Functions</h4>
-</div>
-</div>
-</div>
-<p>Naturally, the Modeling tools provide general functions for performing calculations, comparisons and more complex mathematical expressions. The function library can be easily extended, and we'll be adding additional capabilities over time. As always, we welcome feedback and we'd like to hear what functions you need that aren't covered here.</p>
-<div class="section" title="Logical Operators">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Logical_Operators"></a>Logical Operators</h5>
-</div>
-</div>
-</div>
-<div class="section" title="Not">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Not"></a>Not</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression !X.</p>
-</div>
-<div class="section" title="Equal">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Equal"></a>Equal</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X==Y.</p>
-</div>
-<div class="section" title="Identical">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Identical"></a>Identical</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X==Y.</p>
-</div>
-<div class="section" title="Greater">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Greater"></a>Greater</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X&gt;Y.</p>
-</div>
-<div class="section" title="Lesser">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Lesser"></a>Lesser</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X&lt;Y.</p>
-</div>
-<div class="section" title="Greater or Equal">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Greater_or_Equal"></a>Greater or Equal</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X&gt;=Y.</p>
-</div>
-<div class="section" title="Lesser or Equal">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Lesser_or_Equal"></a>Lesser or Equal</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X&lt;=Y.</p>
-</div>
-<div class="section" title="True">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="True"></a>True</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression true.</p>
-</div>
-<div class="section" title="False">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="False"></a>False</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression false.</p>
-</div>
-<div class="section" title="Identity">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Identity"></a>Identity</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X.</p>
-</div>
-<div class="section" title="Different">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Different"></a>Different</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X!=Y.</p>
-</div>
-</div>
-<div class="section" title="Numeric Operators">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Numeric_Operators"></a>Numeric Operators</h5>
-</div>
-</div>
-</div>
-<div class="section" title="Negative Value">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Negative_Value"></a>Negative Value</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression -X.</p>
-</div>
-<div class="section" title="Add">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Add"></a>Add</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X+Y.</p>
-</div>
-<div class="section" title="Subtract">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Subtract"></a>Subtract</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X-Y.</p>
-</div>
-<div class="section" title="Multiply">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Multiply"></a>Multiply</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X*Y.</p>
-</div>
-<div class="section" title="Divide">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Divide"></a>Divide</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X/Y.</p>
-</div>
-<div class="section" title="Power">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Power"></a>Power</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X^Y.</p>
-</div>
-<div class="section" title="Modulo">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Modulo"></a>Modulo</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression X%Y.</p>
-</div>
-<div class="section" title="Increment">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Increment"></a>Increment</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression ++X.</p>
-</div>
-<div class="section" title="Decrement">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Decrement"></a>Decrement</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression --X.</p>
-</div>
-<div class="section" title="Unit Value">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Unit_Value"></a>Unit Value</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression 1.</p>
-</div>
-<div class="section" title="Zero Value">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Zero_Value"></a>Zero Value</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression 0.</p>
-</div>
-<div class="section" title="Original Value">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Original_Value"></a>Original Value</h6>
-</div>
-</div>
-</div>
-<p>The result of the expression o.</p>
-</div>
-</div>
-<div class="section" title="Math">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Math"></a>Math</h5>
-</div>
-</div>
-</div>
-<p>The math functions use the extremely well specified and tested routines form the Java Math library. (Because of copyright restrictions, we aren't able to include the exact definitions here. Click on the links to get more details on each function.)</p>
-<div class="section" title="Sine">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Sine"></a>Sine</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#sin(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#sin(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Cosine">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Cosine"></a>Cosine</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#cos(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#cos(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Tangent">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Tangent"></a>Tangent</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#tan(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#tan(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Arc Sine">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Arc_Sine"></a>Arc Sine</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#asin(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#asin(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Arc Cosine">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Arc_Cosine"></a>Arc Cosine</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#acos(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#acos(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Arc Tangent">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Arc_Tangent"></a>Arc Tangent</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#atan(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#atan(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Convert Degree to Radians">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Convert_Degree_to_Radians"></a>Convert Degree to Radians</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#toRadians(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#toRadians(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Convert Radians to Degrees">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Convert_Radians_to_Degrees"></a>Convert Radians to Degrees</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#toDegrees(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#toDegrees(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Exp">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Exp"></a>Exp</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#exp(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#exp(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Log">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Log"></a>Log</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#log(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#log(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Log b10">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Log_b10"></a>Log b10</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#log10(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#log10(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Square Root">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Square_Root"></a>Square Root</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#squareRoot(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#squareRoot(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Cube Root">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Cube_Root"></a>Cube Root</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#cbrt(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#cbrt(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Remainder">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Remainder"></a>Remainder</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#iEEEremainder(double,%20double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#iEEEremainder(double,%20double)</a>
-							
-</p>
-</div>
-<div class="section" title="Ceiling">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Ceiling"></a>Ceiling</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#ceil(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#ceil(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Floor">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Floor"></a>Floor</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#floor(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#floor(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Rount">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Rount"></a>Rount</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#rint(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#rint(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Arc Tangent Rectangular">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Arc_Tangent_Rectangular"></a>Arc Tangent Rectangular</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#atan2(double,%20double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#atan2(double,%20double)</a>
-							
-</p>
-</div>
-<div class="section" title="Power">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Power_2"></a>Power</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#pow(double,%20double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#pow(double,%20double)</a>
-							
-</p>
-</div>
-<div class="section" title="Absolute Value">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Absolute_Value"></a>Absolute Value</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#abs(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#abs(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Maximum">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Maximum"></a>Maximum</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#max(double,%20double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#max(double,%20double)</a>
-							
-</p>
-</div>
-<div class="section" title="Minimum">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Minimum"></a>Minimum</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#min(double,%20double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#min(double,%20double)</a>
-							
-</p>
-</div>
-<div class="section" title="ULP">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="ULP"></a>ULP</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#ulp(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#ulp(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Sign">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Sign"></a>Sign</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#signum(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#signum(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Hyperbolic Sine">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Hyperbolic_Sine"></a>Hyperbolic Sine</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#sinh(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#sinh(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Hyperbolic Cosine">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Hyperbolic_Cosine"></a>Hyperbolic Cosine</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#cosh(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#cosh(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Hyperbolic Tan">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Hyperbolic_Tan"></a>Hyperbolic Tan</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#tanh(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#tanh(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Hypotuneuse">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Hypotuneuse"></a>Hypotuneuse</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#hypotuneuse(double,%20double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#hypotuneuse(double,%20double)</a>
-							
-</p>
-</div>
-<div class="section" title="Expm1">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Expm1"></a>Expm1</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#expm1(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#expm1(double)</a>
-							
-</p>
-</div>
-<div class="section" title="Log1p">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Log1p"></a>Log1p</h6>
-</div>
-</div>
-</div>
-<p>See JavaDoc: 
-								<a class="ulink" href="http://java.sun.com/javase/6/docs/api/java/lang/Math.html#log1p(double)" target="_new">http://java.sun.com/javase/6/docs/api/java/lang/Math.html#log1p(double)</a>
-							
-</p>
-</div>
-</div>
-</div>
-<div class="section" title="Random">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Random"></a>Random</h4>
-</div>
-</div>
-</div>
-<div class="section" title="Design">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Design"></a>Design</h5>
-</div>
-</div>
-</div>
-<p>Random functions are especially significant for agent models. Of particular interest are the weighted membership and random state and boolean value functions. You should be familiar with these functions so that you don't have to create more complex Action flows to accomplish the same thing.</p>
-<p>Note that we only have support for uniform distributions as of this release. We're working on a collaborative design for evaluations that allow easy mixing and matching of random functions and distributions.</p>
-</div>
-<div class="section" title="Details">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Details_6"></a>Details</h5>
-</div>
-</div>
-</div>
-<div class="section" title="Random In Range">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Random_In_Range"></a>Random In Range</h6>
-</div>
-</div>
-</div>
-<p>A pseudo-random value within that numeric range specified as drawn from a uniform distribution. The minimum values are inclusive. The maximum values are inclusive for integer inputs and exclusive for Real inputs.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Numeral]&nbsp;The&nbsp;minimum&nbsp;value&nbsp;(inclusive).<br>
-[Numeral]&nbsp;The&nbsp;maximum&nbsp;value&nbsp;(inclusive).<br>
-Outputs:<br>
-[Numeral]&nbsp;The&nbsp;random&nbsp;number.<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Random To Limit">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Random_To_Limit"></a>Random To Limit</h6>
-</div>
-</div>
-</div>
-<p>A pseudo-random value between zero and the value specified by the (non-zero) input and drawn from a uniform range. That value is inclusive for Integers and exclusive for Reals. (Note that as with the random in range function in the context of real numbers the distinction between an exclusive and inclusive limit is essentially meaningless.)</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Numeral]&nbsp;The&nbsp;maximum&nbsp;value&nbsp;(inclusive).<br>
-Outputs:<br>
-[Numeral]&nbsp;The&nbsp;result.<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Random Unit">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Random_Unit"></a>Random Unit</h6>
-</div>
-</div>
-</div>
-<p>A pseudo-random Real value between 0 and 1 drawn from a uniform distribution. (The distinction between inclusive and exclusive range is essentially meaningless in this context and we can assume that the result will never be greater or equal to 1.)</p>
-<div class="literallayout">
-<p>Outputs:<br>
-[Real]&nbsp;<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Random Boolean">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Random_Boolean"></a>Random Boolean</h6>
-</div>
-</div>
-</div>
-<p>A value that is randomly true or false, i.e. a fair coin toss.</p>
-</div>
-<div class="section" title="Random Weighted">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Random_Weighted"></a>Random Weighted</h6>
-</div>
-</div>
-</div>
-<p>An indexed value weighted against a probability distribution. The total probability must sum to 1.0. For example, an input of {.1,.2,.7} under a uniform distribution would would have 10% probability of producing "0" , 20%  for "1" and 70% for "2". This function can then be used with Item to return a biased result from another list.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Real]&nbsp;A&nbsp;list&nbsp;of&nbsp;values&nbsp;that&nbsp;will&nbsp;determine&nbsp;the&nbsp;resulting&nbsp;weighted&nbsp;index.<br>
-Outputs:<br>
-[Integer]&nbsp;A&nbsp;resulting&nbsp;indexed&nbsp;value&nbsp;bounded&nbsp;by&nbsp;0&nbsp;and&nbsp;the&nbsp;length&nbsp;of&nbsp;the&nbsp;input&nbsp;list&nbsp;-&nbsp;1.<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Random Member">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Random_Member"></a>Random Member</h6>
-</div>
-</div>
-</div>
-<p>Represents a random value drawn from the set of Real values specified.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Real]&nbsp;Returns&nbsp;a&nbsp;random&nbsp;member&nbsp;of&nbsp;the&nbsp;supplied&nbsp;list&nbsp;of&nbsp;numbers.<br>
-Outputs:<br>
-[Generic]&nbsp;The&nbsp;value&nbsp;of&nbsp;the&nbsp;item&nbsp;at&nbsp;a&nbsp;random&nbsp;index.<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Random State">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Random_State"></a>Random State</h6>
-</div>
-</div>
-</div>
-<p>A random specified value (option) from the specified state.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Generic]&nbsp;The&nbsp;state&nbsp;to&nbsp;select&nbsp;items&nbsp;from.&nbsp;All&nbsp;items&nbsp;are&nbsp;included.<br>
-Outputs:<br>
-[Boolean]&nbsp;The&nbsp;resulting&nbsp;option.&nbsp;<br>
-
-</p>
-</div>
-</div>
-</div>
-</div>
-<div class="section" title="Space">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Space_3"></a>Space</h4>
-</div>
-</div>
-</div>
-<div class="section" title="Design">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Design_2"></a>Design</h5>
-</div>
-</div>
-</div>
-<p>Spatial functions provide the core functionality for Agent Models. Spatial functions are polymorphic, which basically means that they don't care what space they are operating on as long as that space is suitable for them. Spatial functions are designed to collaborate with one another. For example, by intersecting the "Neighbor", "Available" and "Toward" functions, we can design a rule that causes the agent to move to the next neighboring cell that get's it closer to some target agent. See the function details for more information.</p>
-</div>
-<div class="section" title="Details">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Details_7"></a>Details</h5>
-</div>
-</div>
-</div>
-<div class="section" title="Nearest">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Nearest"></a>Nearest</h6>
-</div>
-</div>
-</div>
-<p>Represents the nearest agents (including gird cells) or locations to this agent. If more than one agent or location is the same distance away they will all be considered. Note that while this function is defined for the selection of an agent, the result of this function is defined by the context within which it is used. If the selection specifies another agent within a space, this function will represent the nearest agent in that space. If the selection specifies a Cell within a grid space, this function will represent that cell.</p>
-</div>
-<div class="section" title="Toward">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Toward"></a>Toward</h6>
-</div>
-</div>
-</div>
-<p>Represents a location that is on the shortest path to a particular agent or location from the source agent (that is, the selection's selection's agent). This function collaborates with the within and neighbor functions to allow the agent to move in a particular direction towards some objective.</p>
-</div>
-<div class="section" title="Within">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Within_4"></a>Within</h6>
-</div>
-</div>
-</div>
-<p>Represents a limit to the distance of a spatial search. When used in combination with other spatial functions such as "nearest" requires that all agents or locations must be within the distance specified by the input value.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Numeral]&nbsp;<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Neighbor">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Neighbor"></a>Neighbor</h6>
-</div>
-</div>
-</div>
-<p>Represents any agents that are nearest neighbors to the agent, that is nominally of distance 1. This function is only relevant in discrete spaces -- grids and networks -- where there are immediate neighboring cells as defined by the geometry of the selection's space.</p>
-</div>
-<div class="section" title="Include Self">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Include_Self"></a>Include Self</h6>
-</div>
-</div>
-</div>
-<p>Specifies whether the agent that we are searching from -- that is, the agent of the selection for this Query Action's selection -- is included in the results of the search.</p>
-</div>
-<div class="section" title="Within 2D Boundary">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Within_2D_Boundary"></a>Within 2D Boundary</h6>
-</div>
-</div>
-</div>
-<p>Represents agents or locations that exist within the boundary specified by the inputs.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Numeral]&nbsp;<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Here">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Here"></a>Here</h6>
-</div>
-</div>
-</div>
-<p>Represents the location of the searching agent. For example, if a selection is defined for an agent cell, and that selection's selection's agent is an occupant of a cell, the cell that the agent is occupying will be used. </p>
-</div>
-<div class="section" title="Available">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Available"></a>Available</h6>
-</div>
-</div>
-</div>
-<p>Represents cells which are not currently occupied. This function is only relevant for grids which are not multi-occupant.</p>
-</div>
-<div class="section" title="Distance">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Distance"></a>Distance</h6>
-</div>
-</div>
-</div>
-<p>The distance between the source agent and an agent represented by this selection. If more than one agent is represented by the other functions in the selection, this function will the distance to an arbitrary (randomly selected) agent as defined by those other functions.</p>
-<div class="literallayout">
-<p>Outputs:<br>
-[Real]&nbsp;<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Away">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Away"></a>Away</h6>
-</div>
-</div>
-</div>
-<p>Represents a location that is on the path that will take the source agent (that is, the selection's selection's agent) the farthest distance from the agent(s) represented by the search. This function collaborates with the within and neighbor functions to allow the agent to move in a particular direction away from some location or agent.</p>
-</div>
-<div class="section" title="Minimize">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Minimize"></a>Minimize</h6>
-</div>
-</div>
-</div>
-<p>This function is not currently supported.</p>
-</div>
-<div class="section" title="Maximize">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Maximize"></a>Maximize</h6>
-</div>
-</div>
-</div>
-<p>This function is not currently supported.</p>
-</div>
-<div class="section" title="Location 2D">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Location_2D"></a>Location 2D</h6>
-</div>
-</div>
-</div>
-<p>Represents the location of the current agent for use in subsequent selections.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Real]&nbsp;<br>
-[Real]&nbsp;<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Boundary 2D">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Boundary_2D"></a>Boundary 2D</h6>
-</div>
-</div>
-</div>
-<p>Represents a two-dimensional boundary within a space. (Not currently relevant for any general usages.)</p>
-<div class="literallayout">
-<p>Outputs:<br>
-[Real]&nbsp;<br>
-[Real]&nbsp;<br>
-
-</p>
-</div>
-</div>
-</div>
-<div class="section" title="Example">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Example_2"></a>Example</h5>
-</div>
-</div>
-</div>
-<p>For examples of how spatial functions can be used within action flows to provide agents with complex movement behaviors, see the Modelers Guide actions examples. In the following example from that section, we define an action that causes a partner agent to move to an available neighboring space.</p>
-<p>
-							
-</p>
-<div class="mediaobject">
-<img src="images/actions/ActionsExampleNew.png"></div>
-<p>
-						
-</p>
-</div>
-</div>
-<div class="section" title="Time">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Time"></a>Time</h4>
-</div>
-</div>
-</div>
-<div class="section" title="Details">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Details_8"></a>Details</h5>
-</div>
-</div>
-</div>
-<div class="section" title="Now">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Now"></a>Now</h6>
-</div>
-</div>
-</div>
-<p>The current simulation period, that is the number of iterations that the model has gone through, or in the case of models with callibrarted time, the number of iterations added to the model's nominal start time.</p>
-<div class="literallayout">
-<p>Outputs:<br>
-[Integer]&nbsp;The&nbsp;current&nbsp;period.<br>
-
-</p>
-</div>
-</div>
-</div>
-</div>
-<div class="section" title="Graphics">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Graphics"></a>Graphics</h4>
-</div>
-</div>
-</div>
-<div class="section" title="Design">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Design_3"></a>Design</h5>
-</div>
-</div>
-</div>
-<p>Graphic functions are combined within Style Evaluate Actions to determine how to draw an agent within a visualization. One nice aspect of this approach is that the same style definition can be used in multiple places without changing any code. For example, the same style could be used to draw an agent on a two-dimensional grid within Escape, a three-dimensional shape within Escape, a Java Swing based visualization in Ascape, and an XML configured visualizaiton in Repast Simphony.</p>
-<p>To define a graphic style for an agent, design a flow in which you create Evaluate Actions for color and shape, and then create an Evaluate Action with the graphic fill or outline function as a target of these.</p>
-</div>
-<div class="section" title="Details">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Details_9"></a>Details</h5>
-</div>
-</div>
-</div>
-<div class="section" title="Shape Oval">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Shape_Oval"></a>Shape Oval</h6>
-</div>
-</div>
-</div>
-<p>Draw a generic oval.</p>
-</div>
-<div class="section" title="Shape Rectangle">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Shape_Rectangle"></a>Shape Rectangle</h6>
-</div>
-</div>
-</div>
-<p>Draws a rectangular shape.</p>
-</div>
-<div class="section" title="Shape Inset">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Shape_Inset"></a>Shape Inset</h6>
-</div>
-</div>
-</div>
-<p>Shrinks the current shape by the input amount. (The overall scale is currently unspecified, but in most implementations should be 20.)</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Integer]&nbsp;Number&nbsp;of&nbsp;nominal&nbsp;pixels&nbsp;to&nbsp;inset.<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Shape Marker">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Shape_Marker"></a>Shape Marker</h6>
-</div>
-</div>
-</div>
-<p>Draw a marker, that is a graphical indicator that can be used to add an additional cue about the object state. For example, in a two-dimensional graphics representation this might be a small shape drawn inset at the corner of the larger shape. </p>
-</div>
-<div class="section" title="Shape Marker 2">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Shape_Marker_2"></a>Shape Marker 2</h6>
-</div>
-</div>
-</div>
-<p>Represents a marker placed in a different location from the other shape markers.</p>
-</div>
-<div class="section" title="Shape Marker 3">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Shape_Marker_3"></a>Shape Marker 3</h6>
-</div>
-</div>
-</div>
-<p>Represents a marker placed in a different location from the other shape markers.</p>
-</div>
-<div class="section" title="Color RGB">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Color_RGB"></a>Color RGB</h6>
-</div>
-</div>
-</div>
-<p>A color specified by the three inputs for Red, Green and Blue color components. Those inputs are expected to be in the range 0..1.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Real]&nbsp;A&nbsp;value&nbsp;from&nbsp;0.0&nbsp;to&nbsp;1.0.<br>
-[Real]&nbsp;A&nbsp;value&nbsp;from&nbsp;0.0&nbsp;to&nbsp;1.0.<br>
-[Real]&nbsp;A&nbsp;value&nbsp;from&nbsp;0.0&nbsp;to&nbsp;1.0.<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Color Red">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Color_Red"></a>Color Red</h6>
-</div>
-</div>
-</div>
-<p>The color red.</p>
-</div>
-<div class="section" title="Color Yellow">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Color_Yellow"></a>Color Yellow</h6>
-</div>
-</div>
-</div>
-<p>The color yellow.</p>
-</div>
-<div class="section" title="Color Blue">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Color_Blue"></a>Color Blue</h6>
-</div>
-</div>
-</div>
-<p>The color blue.</p>
-</div>
-<div class="section" title="Color Orange">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Color_Orange"></a>Color Orange</h6>
-</div>
-</div>
-</div>
-<p>The color orange.</p>
-</div>
-<div class="section" title="Color Green">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Color_Green"></a>Color Green</h6>
-</div>
-</div>
-</div>
-<p>The color green.</p>
-</div>
-<div class="section" title="Color Purple">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Color_Purple"></a>Color Purple</h6>
-</div>
-</div>
-</div>
-<p>The color purple.</p>
-</div>
-<div class="section" title="Color Black">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Color_Black"></a>Color Black</h6>
-</div>
-</div>
-</div>
-<p>The color black.</p>
-</div>
-<div class="section" title="Color White">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Color_White"></a>Color White</h6>
-</div>
-</div>
-</div>
-<p>The color white.</p>
-</div>
-<div class="section" title="Color Gray">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Color_Gray"></a>Color Gray</h6>
-</div>
-</div>
-</div>
-<p>The color gray.</p>
-</div>
-<div class="section" title="Graphic Outline">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Graphic_Outline"></a>Graphic Outline</h6>
-</div>
-</div>
-</div>
-<p>Draws an outline of the last evaluated shape, using the last specified color or the default color (usually black) if none has been specified.</p>
-</div>
-<div class="section" title="Graphic Fill">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Graphic_Fill"></a>Graphic Fill</h6>
-</div>
-</div>
-</div>
-<p>Fills the last evaluated shape with the last specified color or the default color (usually black) if none has been specified.</p>
-</div>
-</div>
-<div class="section" title="Example">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Example_3"></a>Example</h5>
-</div>
-</div>
-</div>
-<p>In the following action flow for the epidemic style, we've create Query Actions to determine each agent's current state, picked a color based on that, and then used a shared target to select a shape for the agent style and fill it:</p>
-<p>
-							
-</p>
-<div class="mediaobject">
-<img src="images/functions/GraphicsFunctionExampleDesign.png"></div>
-<p>
-						
-</p>
-<p>After saving the model we can execute the two and three dimensional visualizations. Note something really nice -- even the charts have used the colors we've defined!</p>
-<p>
-							
-</p>
-<div class="mediaobject">
-<img src="images/functions/GraphicsFunctionExampleRun.png"></div>
-<p>
-						
-</p>
-</div>
-</div>
-<div class="section" title="Lists">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Lists"></a>Lists</h4>
-</div>
-</div>
-</div>
-<div class="section" title="Details">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Details_10"></a>Details</h5>
-</div>
-</div>
-</div>
-<div class="section" title="Item">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Item"></a>Item</h6>
-</div>
-</div>
-</div>
-<p>Returns the item at the specified index from the list of items provided. Those items will typically be input primitives such as Integer or Real values.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Generic]&nbsp;<br>
-[Integer]&nbsp;<br>
-Outputs:<br>
-[Generic]&nbsp;<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Length">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Length"></a>Length</h6>
-</div>
-</div>
-</div>
-<p>The number of items in the provided list of items.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Generic]&nbsp;<br>
-Outputs:<br>
-[Integer]&nbsp;<br>
-
-</p>
-</div>
-</div>
-</div>
-</div>
-<div class="section" title="Attribute Distributions">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Attribute_Distributions"></a>Attribute Distributions</h4>
-</div>
-</div>
-</div>
-<p>One of the most common tasks in the Agent Modeling process is the creation of agents with particular states drawn from a distribution. For example, you might want to create a number of agents with wealth randomly distributed between some minimum and maximum values. The distribution functions greatly ease the process of setting up those initializations and their associated parameters.</p>
-<div class="section" title="Distribution">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Distribution"></a>Distribution</h5>
-</div>
-</div>
-</div>
-<div class="section" title="Uniform Cross Distribution">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Uniform_Cross_Distribution"></a>Uniform Cross Distribution</h6>
-</div>
-</div>
-</div>
-<p>A random number taken from a distribution of values as defined by a cross of all values. (See Cross Distribution.) This funciton then returns a value drawn from the minimum and maximum values as determined by the current agent state. In the cross distribution, each of the values is treated independently so that an input attribute is created for every potential combination of states.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Generic]&nbsp;The&nbsp;list&nbsp;of&nbsp;states&nbsp;to&nbsp;factor&nbsp;into&nbsp;the&nbsp;distribution.&nbsp;This&nbsp;is&nbsp;a&nbsp;multi-argument,&nbsp;which&nbsp;means&nbsp;that&nbsp;you&nbsp;can&nbsp;specify&nbsp;any&nbsp;number&nbsp;of&nbsp;attributes&nbsp;as&nbsp;arguments.<br>
-[Real]&nbsp;The&nbsp;set&nbsp;of&nbsp;attributes&nbsp;that&nbsp;will&nbsp;determine&nbsp;the&nbsp;minimum&nbsp;value&nbsp;of&nbsp;the&nbsp;function&nbsp;result&nbsp;based&nbsp;on&nbsp;the&nbsp;current&nbsp;state&nbsp;of&nbsp;the&nbsp;agent.&nbsp;Note&nbsp;that&nbsp;this&nbsp;list&nbsp;is&nbsp;automatically&nbsp;created&nbsp;and&nbsp;maintained.&nbsp;These&nbsp;values&nbsp;don't&nbsp;need&nbsp;to&nbsp;be&nbsp;and&nbsp;should&nbsp;not&nbsp;be&nbsp;manually&nbsp;edited.<br>
-[Real]&nbsp;The&nbsp;set&nbsp;of&nbsp;attributes&nbsp;that&nbsp;will&nbsp;determine&nbsp;the&nbsp;maximum&nbsp;value&nbsp;of&nbsp;the&nbsp;function&nbsp;result&nbsp;based&nbsp;on&nbsp;the&nbsp;current&nbsp;state&nbsp;of&nbsp;the&nbsp;agent.&nbsp;Note&nbsp;that&nbsp;this&nbsp;list&nbsp;is&nbsp;automatically&nbsp;created&nbsp;and&nbsp;maintained.&nbsp;These&nbsp;values&nbsp;don't&nbsp;need&nbsp;to&nbsp;be&nbsp;and&nbsp;should&nbsp;not&nbsp;be&nbsp;manually&nbsp;edited.<br>
-Outputs:<br>
-[Real]&nbsp;The&nbsp;resulting&nbsp;random&nbsp;number&nbsp;based&nbsp;on&nbsp;the&nbsp;current&nbsp;agent&nbsp;state&nbsp;and&nbsp;the&nbsp;input&nbsp;parameters.<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Uniform Additive Distribution">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Uniform_Additive_Distribution"></a>Uniform Additive Distribution</h6>
-</div>
-</div>
-</div>
-<p>A random number taken from a distribution of values in which each of the minimum and maximum values are added to determine a total minimum and maximum value. (See Additive Distribution.) In the additive distribution, each of the values is treated as dependent on the others so that an input attribute is only created for each seperate state.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Generic]&nbsp;The&nbsp;list&nbsp;of&nbsp;states&nbsp;to&nbsp;factor&nbsp;into&nbsp;the&nbsp;distribution.&nbsp;This&nbsp;is&nbsp;a&nbsp;multi-argument,&nbsp;which&nbsp;means&nbsp;that&nbsp;you&nbsp;can&nbsp;specify&nbsp;any&nbsp;number&nbsp;of&nbsp;attributes&nbsp;as&nbsp;arguments.<br>
-[Real]&nbsp;The&nbsp;set&nbsp;of&nbsp;attributes&nbsp;that&nbsp;will&nbsp;determine&nbsp;the&nbsp;minimum&nbsp;value&nbsp;of&nbsp;the&nbsp;function&nbsp;result&nbsp;based&nbsp;on&nbsp;the&nbsp;current&nbsp;state&nbsp;of&nbsp;the&nbsp;agent.&nbsp;Note&nbsp;that&nbsp;this&nbsp;list&nbsp;is&nbsp;automatically&nbsp;created&nbsp;and&nbsp;maintained.&nbsp;These&nbsp;values&nbsp;don't&nbsp;need&nbsp;to&nbsp;be&nbsp;and&nbsp;should&nbsp;not&nbsp;be&nbsp;manually&nbsp;edited.<br>
-[Real]&nbsp;The&nbsp;set&nbsp;of&nbsp;attributes&nbsp;that&nbsp;will&nbsp;determine&nbsp;the&nbsp;maximum&nbsp;value&nbsp;of&nbsp;the&nbsp;function&nbsp;result&nbsp;based&nbsp;on&nbsp;the&nbsp;current&nbsp;state&nbsp;of&nbsp;the&nbsp;agent.&nbsp;Note&nbsp;that&nbsp;this&nbsp;list&nbsp;is&nbsp;automatically&nbsp;created&nbsp;and&nbsp;maintained.&nbsp;These&nbsp;values&nbsp;don't&nbsp;need&nbsp;to&nbsp;be&nbsp;and&nbsp;should&nbsp;not&nbsp;be&nbsp;manually&nbsp;edited.<br>
-Outputs:<br>
-[Real]&nbsp;The&nbsp;resulting&nbsp;random&nbsp;number&nbsp;based&nbsp;on&nbsp;the&nbsp;current&nbsp;agent&nbsp;state&nbsp;and&nbsp;the&nbsp;input&nbsp;parameters.<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Cross Distribution">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Cross_Distribution"></a>Cross Distribution</h6>
-</div>
-</div>
-</div>
-<p>A value taken from a set of (auto-generated) attributes based on the value of each state included. For example, if the multi-values included a state X with values A and B and a state Y with values I and II, this distribution would create separate input attributes for AI, AII, BI and BII. Then for an agent with States A and II this function would return the value specified by the AII input attribute.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Generic]&nbsp;The&nbsp;list&nbsp;of&nbsp;states&nbsp;to&nbsp;factor&nbsp;into&nbsp;the&nbsp;distribution.&nbsp;This&nbsp;is&nbsp;a&nbsp;multi-argument,&nbsp;which&nbsp;means&nbsp;that&nbsp;you&nbsp;can&nbsp;specify&nbsp;any&nbsp;number&nbsp;of&nbsp;attributes&nbsp;as&nbsp;arguments.<br>
-[Real]&nbsp;The&nbsp;set&nbsp;of&nbsp;attributes&nbsp;that&nbsp;when&nbsp;multiplied&nbsp;against&nbsp;each&nbsp;other&nbsp;will&nbsp;determine&nbsp;the&nbsp;value&nbsp;of&nbsp;the&nbsp;function&nbsp;result&nbsp;based&nbsp;on&nbsp;the&nbsp;current&nbsp;state&nbsp;of&nbsp;the&nbsp;agent.&nbsp;Note&nbsp;that&nbsp;this&nbsp;list&nbsp;is&nbsp;automatically&nbsp;created&nbsp;and&nbsp;maintained.&nbsp;These&nbsp;values&nbsp;don't&nbsp;need&nbsp;to&nbsp;be&nbsp;and&nbsp;should&nbsp;not&nbsp;be&nbsp;manually&nbsp;edited.<br>
-Outputs:<br>
-[Real]&nbsp;The&nbsp;resulting&nbsp;value&nbsp;based&nbsp;on&nbsp;the&nbsp;current&nbsp;agent&nbsp;state&nbsp;and&nbsp;the&nbsp;input&nbsp;parameters.<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Additive Distribution">
-<div class="titlepage">
-<div>
-<div>
-<h6 class="title">
-<a name="Additive_Distribution"></a>Additive Distribution</h6>
-</div>
-</div>
-</div>
-<p>A value taken from a set of (auto-generated) attributes based on the combined values of the states provided. For example, if the multi-values included a state X with values A and B and a state Y with values I and II, this distribution would create input attributes for A, B, I and II. Those values would then be added together, so that for an Agent with state A and II this function would return A + II.</p>
-<div class="literallayout">
-<p>Inputs:<br>
-[Generic]&nbsp;The&nbsp;states&nbsp;to&nbsp;include&nbsp;in&nbsp;the&nbsp;distribution.&nbsp;This&nbsp;is&nbsp;a&nbsp;multi-argument,&nbsp;which&nbsp;means&nbsp;that&nbsp;you&nbsp;can&nbsp;specify&nbsp;any&nbsp;number&nbsp;of&nbsp;attributes&nbsp;as&nbsp;arguments.<br>
-[Real]&nbsp;The&nbsp;set&nbsp;of&nbsp;attributes&nbsp;that&nbsp;when&nbsp;combined&nbsp;with&nbsp;each&nbsp;other&nbsp;determine&nbsp;the&nbsp;value&nbsp;of&nbsp;the&nbsp;function&nbsp;result&nbsp;based&nbsp;on&nbsp;the&nbsp;current&nbsp;state&nbsp;of&nbsp;the&nbsp;agent.&nbsp;Note&nbsp;that&nbsp;this&nbsp;list&nbsp;is&nbsp;automatically&nbsp;created&nbsp;and&nbsp;maintained.&nbsp;These&nbsp;values&nbsp;don't&nbsp;need&nbsp;to&nbsp;be&nbsp;and&nbsp;should&nbsp;not&nbsp;be&nbsp;manually&nbsp;edited.<br>
-Outputs:<br>
-[Real]&nbsp;The&nbsp;resulting&nbsp;value&nbsp;based&nbsp;on&nbsp;the&nbsp;current&nbsp;agent&nbsp;state&nbsp;and&nbsp;the&nbsp;input&nbsp;parameters.<br>
-
-</p>
-</div>
-</div>
-</div>
-<div class="section" title="Example">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Example_4"></a>Example</h5>
-</div>
-</div>
-</div>
-<p>In the following example, we walk through the process of using a distribution functions, demonstrating how we can easily modify the Epidemic model so that instead of simply setting an initial exposed population, we can define factors that take together will determine an individuals initial exposure state. We simply:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="1">
-<li class="listitem">
-<p>Create an Evaluate Action called "Initial Status". </p>
-</li>
-<li class="listitem">
-<p>Set the function to "Cross Distribution"</p>
-</li>
-<li class="listitem">
-<p>Opened the "Multiple Value" node in the editor, and clicked the "Multiple Values" item within it.</p>
-</li>
-<li class="listitem">
-<p>Selected the "Status" attribute.</p>
-</li>
-</ol>
-</div>
-<p>
-							
-</p>
-<div class="mediaobject">
-<img src="images/functions/DistributionDesignChoice.png"></div>
-<p> 
-						
-</p>
-<p>The appropriate attributes are automatically added to the model, as you can see below.</p>
-<p>
-							
-</p>
-<div class="mediaobject">
-<img src="images/functions/DistributionDesign.png"></div>
-<p> 
-						
-</p>
-<p>In order to assign these values to the agent, we'd simply need to assign the results of this Evaluate Action to the agent.</p>
-</div>
-</div>
-</div>
-<div class="section" title="Reference">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Reference_3"></a>Reference</h3>
-</div>
-</div>
-</div>
-<div class="section" title="Diagrams">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Diagrams_3"></a>Diagrams</h4>
-</div>
-</div>
-</div>
-<p>The following diagram may be helpful to readers familiar with UML and Meta-modeling:</p>
-<div class="section" title="Meta-Classes">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Meta-Classes_3"></a>Meta-Classes</h5>
-</div>
-</div>
-</div>
-<p>
-							
-</p>
-<div class="mediaobject">
-<img src="images/functions/FunctionsDiagram.png"></div>
-<p>
-						
-</p>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="navfooter">
-<hr>
-<table summary="Navigation footer" width="100%">
-<tr>
-<td align="left" width="40%"><a accesskey="p" href="Introduction.html">Prev</a>&nbsp;</td><td align="center" width="20%">&nbsp;</td><td align="right" width="40%">&nbsp;<a accesskey="n" href="User_Guide.html">Next</a></td>
-</tr>
-<tr>
-<td valign="top" align="left" width="40%">Chapter&nbsp;1.&nbsp;Introduction&nbsp;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td valign="top" align="right" width="40%">&nbsp;Chapter&nbsp;3.&nbsp;User Guide</td>
-</tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Programer_Guide.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Programer_Guide.html
deleted file mode 100644
index 6ed74e9..0000000
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Programer_Guide.html
+++ /dev/null
@@ -1,602 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Chapter&nbsp;5.&nbsp;Programer Guide</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
-<link rel="home" href="index.html" title="Agent Modeling Guide">
-<link rel="up" href="index.html" title="Agent Modeling Guide">
-<link rel="prev" href="Tutorials.html" title="Chapter&nbsp;4.&nbsp;Tutorials">
-<link rel="next" href="Resources.html" title="Chapter&nbsp;6.&nbsp;Resources">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<div class="navheader">
-<table summary="Navigation header" width="100%">
-<tr>
-<th align="center" colspan="3">Chapter&nbsp;5.&nbsp;Programer Guide</th>
-</tr>
-<tr>
-<td align="left" width="20%"><a accesskey="p" href="Tutorials.html">Prev</a>&nbsp;</td><th align="center" width="60%">&nbsp;</th><td align="right" width="20%">&nbsp;<a accesskey="n" href="Resources.html">Next</a></td>
-</tr>
-</table>
-<hr>
-</div>
-<div class="chapter" title="Chapter&nbsp;5.&nbsp;Programer Guide">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title">
-<a name="Programer_Guide"></a>Chapter&nbsp;5.&nbsp;Programer Guide</h2>
-</div>
-</div>
-</div>
-<div class="toc">
-<dl>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Overview_6">Overview</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Getting_Started_2">Getting Started</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Documentation_and_other_Resources">Documentation and other Resources</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Installation">Installation</a></span>
-</dt>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Developing_Models">Developing Models</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Programer_Guide.html#More_Information">More Information</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Integrating_Java_and_AMF_Models">Integrating Java and AMF Models</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Method_Action">Method Action</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Protected_Code_Regions">Protected Code Regions</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Implement_Sub-classes">Implement Sub-classes</a></span>
-</dt>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Converting_Existing_Ascape_models">Converting Existing Ascape models</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Model">Model</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Programer_Guide.html#View">View</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Configuration">Configuration</a></span>
-</dt>
-</dl>
-</dd>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Running_Agent_Models">Running Agent Models</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Exploring_Example_ABM_Models">Exploring Example ABM Models</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Downloading_Models">Downloading Models</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Generating_Models">Generating Models</a></span>
-</dt>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Tutorial">Tutorial</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Next_Steps">Next Steps</a></span>
-</dt>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Programer_Guide.html#Classic_Java_ABM_Models">Classic Java ABM Models</a></span>
-</dt>
-</dl>
-</dd>
-</dl>
-</div>
-<div class="section" title="Overview">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Overview_6"></a>Overview</h2>
-</div>
-</div>
-</div>
-<p>Escape is a full-featured Agent-Based Modeling (ABM) integrated development environment (IDE) with a Java based API and end user modeling tools. It's based on Ascape, which has been in use for more than 10 years. The core API is very stable, and that should give users a way to explore the features of AMP without concerns about keeping in synch with the rapidly evolving AXF /AGF API. It allows modelers to code in Java and/or generate models with AMF and then execute those models within the same development environment.</p>
-<p>
-				
-</p>
-<div class="mediaobject">
-<img src="images/EscapeExecutionScreenshot.png"></div>
-<p>
-			
-</p>
-<p>A primary purpose of the Escape project -- apart from the obvious goal of providing a nice Eclipse hosted ABM toolkit -- is to provide an exemplar to demonstrate how any arbitrary agent modeling framework can be integrated within the AMP environment. A cool aspect of this is that AMP has no dependencies on Escape, but also that the underlying ABM modeling framework for Escape has no dependencies on AMP -- instead Escape simply provides the runtime glue between AMP and the ABM framework. The underlying ABM framework uses the Ascape API, an API that first began development more than ten years ago and that has not been modified at all in order for it to work within the AMP environment.</p>
-</div>
-<div class="section" title="Getting Started">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Getting_Started_2"></a>Getting Started</h2>
-</div>
-</div>
-</div>
-<div class="section" title="Documentation and other Resources">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Documentation_and_other_Resources"></a>Documentation and other Resources</h3>
-</div>
-</div>
-</div>
-<p>Because it's API is based on Ascape, Escape is one component of AMP that already has extensive documentation. There is complete Javadoc as well as a manual and other web resources. See the 
-					<a class="ulink" href="http://ascape.sourceforge.net" target="_new">Ascape Website</a> to locate these resources. There is a 
-					<a class="ulink" href="http://ascape.sourceforge.net/docs/TheAscapeManual5.pdf" target="_new">full manual</a> for Ascape available on that site. Or, you can install the Ascape Manual into the eclipse help system by adding the following update site and selecting the "Documentations and Source Code" feature.
-				</p>
-<p>
-					
-<a class="ulink" href="http://ascape.sourceforge.net/eclipse" target="_new">http://ascape.sourceforge.net/eclipse</a>
-				
-</p>
-</div>
-<div class="section" title="Installation">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Installation"></a>Installation</h3>
-</div>
-</div>
-</div>
-<p>Escape is 
-					<a class="ulink" href="http://eclipse.org/amp/installing/" target="_new">installed</a> by default with the other model components. If you want to do 3D (really 2 1/2) visualizations, you will want AGF3D and the LWJGL dependency. You can build from source but in that case you'l need to launch a self-hosted runtime, so it's best to simply install from the update site if you're not actually doing AMP development.
-				</p>
-</div>
-</div>
-<div class="section" title="Developing Models">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Developing_Models"></a>Developing Models</h2>
-</div>
-</div>
-</div>
-<p>The easiest way for Java developers to get started doing agent-based modeling in Eclipse is to begin to write programs using it. To develop new models, you can:</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="1">
-<li class="listitem">
-<p>Create a new Escape project. The Escape projects are actually configured for AMF code generation so there are dependencies and builders in there that you don't need; you can remove all of the escape builders and any of the kitchen sink items. The "Create an Escape Java Model" cheat sheet will walk you through the process of creating a new Java based project and model.</p>
-</li>
-<li class="listitem">
-<p>Or for more experienced Eclipse users, you can simply to just create a new Plugin Project and add the necessary dependencies there. Have a look at the example escape project to see what you need. Note that you will likely need more dependencies then you need to simply build -- this is because the class loader uses the classes from the project path and so runtime classes have to be there as well. We may simply package an Eclipse runtime convenience plugin to gather these dependencies up a bit.</p>
-</li>
-</ol>
-</div>
-<p>Then just create new Java classes for your root model scape and agents just as you would for an Ascape project.</p>
-</div>
-<div class="section" title="More Information">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="More_Information"></a>More Information</h2>
-</div>
-</div>
-</div>
-<div class="section" title="Integrating Java and AMF Models">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Integrating_Java_and_AMF_Models"></a>Integrating Java and AMF Models</h3>
-</div>
-</div>
-</div>
-<p>If you're like many Java developers, you might find point-and-click interfaces a bit lame. Personally, I've changed my tune in this, and I now define all of my ABM models from the editor, saving Java for truly specialized tasks. But even without generation of agent behavior, Acore can be a really valuable tool, as the GIS example shows. The way to look at metaABM is as a way to compose your overall model and automate the tedious parts. Apart from Java generated code, the AMF meta-model maintains a number of very useful artifacts. For example, the Repast Simphony target maintains model.score and all of the model.rs component. Generally, AMF should save time and hassle while making your models far more transparent even if you never use the Actions component to define agent behavior.</p>
-<div class="section" title="Method Action">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Method_Action"></a>Method Action</h4>
-</div>
-</div>
-</div>
-<p>As explained in the action section, you can simply create a "Method" act with hand-written Java code. This option is nice because all code is contained within the AMF file. But it can be difficult to maintain large blocks of Java code as you aren't using a Java editor to edit the Java code itself. One way to get around this is to create your code in the generated Java method and then copy it into the Method action. Note one imporant issue here -- you'll generally have to fully qualify your Java references as you won't be able to change the imports statements directly. </p>
-</div>
-<div class="section" title="Protected Code Regions">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Protected_Code_Regions"></a>Protected Code Regions</h4>
-</div>
-</div>
-</div>
-<p>You can mix and match Action behavior with Java and generated code with POJOs. One way to do this is through using protected regions. Select the agent you want to create protected methods for and then select "Generate Protected" from the "Mode" property. Now, create actions just as you have before, or use your existing ones. On code generation, open up the relevant java file and examine the methods that have been created. </p>
-<p>
-						
-</p>
-<div class="mediaobject">
-<img src="images/pojo/ProgrammingPojoGenerateProps.png"></div>
-<p>
-					
-</p>
-<p>You can put whatever you want within the PROTECTED REGION comments and those changes will be preserved when the model is regenerated. You can create a schedule, rule or watcher, maintain custom code for the actual implementations, and still have the model adapt to changes in the underlying data structure -- if for example you want to import a modified shape file.</p>
-<p>
-						
-</p>
-<div class="mediaobject">
-<img src="images/pojo/ProgrammingPojoGenerateCode.png"></div>
-<p>
-					
-</p>
-</div>
-<div class="section" title="Implement Sub-classes">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Implement_Sub-classes"></a>Implement Sub-classes</h4>
-</div>
-</div>
-</div>
-<p>Another approach which can be more robust is to generate the basic model stubs (like an abstract base class except that it isn't abstract) and then override your model with implementations. AMF provides support for generic skeletons and interfaces.</p>
-<p>
-						
-</p>
-<div class="mediaobject">
-<img src="images/pojo/ProgrammingPojoGenerate.png"></div>
-<p>
-					
-</p>
-</div>
-</div>
-<div class="section" title="Converting Existing Ascape models">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Converting_Existing_Ascape_models"></a>Converting Existing Ascape models</h3>
-</div>
-</div>
-</div>
-<p>There are only a few changes should have to make to existing Ascape models or to use existing Ascape documentation to develop Escape models.</p>
-<div class="section" title="Model">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Model"></a>Model</h4>
-</div>
-</div>
-</div>
-<p>The core model is completely API compatible. No changes!</p>
-</div>
-<div class="section" title="View">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="View"></a>View</h4>
-</div>
-</div>
-</div>
-<p>Because Escape uses SWT and Ascape uses Swing, there are a few unavoidable incompatibilities. Most of these we avoid by using higher level APIs but here are the key changes that you're likely to have to make:</p>
-<div class="section" title="Convert the low-level imports from AWT and Swing to SWT">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Convert_the_low-level_imports_from_AWT_and_Swing_to_SWT"></a>Convert the low-level imports from AWT and Swing to SWT</h5>
-</div>
-</div>
-</div>
-<p>The simplest way to accomplish this is to remove all of the imports and then organize imports. For example:</p>
-<div class="literallayout">
-<p>java.awt.Color&nbsp;=&gt;&nbsp;org.eclipse.swt.graphics.Color<br>
-java.awt.Graphics&nbsp;=&gt;&nbsp;org.eclipse.draw2d.Graphics<br>
-
-</p>
-</div>
-<p>Then just do a global find for all of the imports and replace them with nothing. This is a great place for a regexp. Try:</p>
-<div class="literallayout">
-<p>find:&nbsp;import&nbsp;java\.awt\.(.*);<br>
-replace:&nbsp;[nothing]<br>
-
-</p>
-</div>
-<p>You don't have to replace these with the SWT equivalents, just click on the project, right-click and choose "Source:Organize Imports.."
-							By the way, a great way to avoid having to select the right entries in optimize imports and to alert you when you have missed anything is to prevent the awt and swing classes from being used at all. Right-click on project, choose "Build Path:Configure Build Path", go to Libraries tab, open JRE System Library, choose "Access Rules", edit, and then add entries for java/awt/** and javax/swing/**. The code will regenerate and you'll have error markers for all of the stuff that won't work with Escape and Eclipse.</p>
-</div>
-<div class="section" title="Convert color features">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Convert_color_features"></a>Convert color features</h5>
-</div>
-</div>
-</div>
-<p>You can't use AWT colors either so you'll need to replace any colors. AMP provides a convenience classes for Colors called ColorFeature and ColorFeatureConcrete. You can use these or any of the other ways to define SWT colors. For example:</p>
-<div class="literallayout">
-<p>Color.lightGray&nbsp;=&gt;&nbsp;ColorFeature.LIGHT_GRAY<br>
-new&nbsp;Color(Math.min(1.0f,&nbsp;(float)&nbsp;(redEnergy&nbsp;+&nbsp;orangeEnergy)),&nbsp;(float)&nbsp;orangeEnergy&nbsp;*&nbsp;.8f,&nbsp;(float)&nbsp;blueEnergy)&nbsp;=&gt;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;ColorFeatureConcrete.create(Math.min(1.0f,&nbsp;(float)&nbsp;(redEnergy&nbsp;+&nbsp;orangeEnergy)),&nbsp;(float)&nbsp;orangeEnergy&nbsp;*&nbsp;.8f,&nbsp;(float)&nbsp;blueEnergy)<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Change agent color getters">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Change_agent_color_getters"></a>Change agent color getters</h5>
-</div>
-</div>
-</div>
-<p>If you've defined colors through overriding Agents as in most models, you'll need to change the method signature. You could just do a global replace for this one.</p>
-<div class="literallayout">
-<p>public&nbsp;Color&nbsp;getColor(&nbsp;=&gt;&nbsp;public&nbsp;Object&nbsp;getPlatformColor(<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Get rid of image features">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Get_rid_of_image_features"></a>Get rid of image features</h5>
-</div>
-</div>
-</div>
-<p>Escape doesn't support them. In practice they haven't been used a lot. At some point perhaps we'll have nice sprite support instead. :)</p>
-<div class="literallayout">
-<p>public&nbsp;Image&nbsp;getImage()&nbsp;{**}&nbsp;=&gt;&nbsp;""<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Modify usages of DrawFeatures">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Modify_usages_of_DrawFeatures"></a>Modify usages of DrawFeatures</h5>
-</div>
-</div>
-</div>
-<p>If you've created any of your own draw features, you'll need to change them slightly to accommodate the differences between the AWT and SWT / Draw2D APIs. This should be pretty straightforwrd. For example:</p>
-<div class="literallayout">
-<p>g.setColor(...<br>
-g.fillOval(..<br>
-becomes:<br>
-g.setBackgroundColor(<br>
-g.fillOval(..<br>
-
-</p>
-</div>
-<p>That's about it, though it's probable that we've missed something. Please post a message on the amp newsgroup if you run into any other conversion issues.</p>
-</div>
-</div>
-<div class="section" title="Configuration">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Configuration"></a>Configuration</h4>
-</div>
-</div>
-</div>
-<p>Instead of using Ant, Escape has really nice support for parameterizing and testing models. See 
-						<a class="ulink" href="/wiki/Experimenting_and_Testing" target="_new">Experimenting and Testing</a> (todo). If you do want to work with ant you will need to install the plugins from the Sourceforge download site. (These have dependencies that I didn't want to bother with going through the Eclipse IP process to get in. If for some reason you think these should be part of core Escape let Miles know and I'll take care of it.) Ant has not been tested for Escape so it's not even clear it will work.
-					</p>
-</div>
-</div>
-</div>
-<div class="section" title="Running Agent Models">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Running_Agent_Models"></a>Running Agent Models</h2>
-</div>
-</div>
-</div>
-<div class="section" title="Exploring Example ABM Models">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Exploring_Example_ABM_Models"></a>Exploring Example ABM Models</h3>
-</div>
-</div>
-</div>
-<p>The first thing most people will want to do in AMP is to play with the example models. You can explore AMF models as well as some really interesting classic ABM models.</p>
-<div class="section" title="Downloading Models">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Downloading_Models"></a>Downloading Models</h4>
-</div>
-</div>
-</div>
-<p>To obtain the models, simply launch the cheat sheet. Go to the 
-						<span class="bold"><strong>Help &gt; Cheat Sheets...</strong></span> menu and choose "Load Sample Projects".
-					</p>
-<p>Or you can get them yourself from the following locations:</p>
-<div class="section" title="AMF Models">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="AMF_Models"></a>AMF Models</h5>
-</div>
-</div>
-</div>
-<div class="literallayout">
-<p>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape<br>
-
-</p>
-</div>
-<p>To understand the capabilities of AMF, you might also want to try out running the same models automatically generated for Ascape or Repast. These are located at dev.eclipse.org in cvsroot/modeling:</p>
-<div class="literallayout">
-<p>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape<br>
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast<br>
-
-</p>
-</div>
-</div>
-<div class="section" title="Escape / Ascape Java Models">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Escape_.2F_Ascape_Java_Models"></a>Escape / Ascape Java Models</h5>
-</div>
-</div>
-</div>
-<p>These are SVN projects in the sourceforge SVN. For help, see 
-							<a class="ulink" href="/wiki/http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php_this_page" target="_new">http://www.eclipse.org/subversive/documentation/teamSupport/find_check_wiz.php this page</a>.
-						</p>
-<div class="literallayout">
-<p>http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.brook<br>
-http://ascape.svn.sourceforge.net/svnroot/ascape/org.ascape.escape.models.examples<br>
-
-</p>
-</div>
-</div>
-</div>
-<div class="section" title="Generating Models">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Generating_Models"></a>Generating Models</h4>
-</div>
-</div>
-</div>
-<p>There are a number of models developed with AMF that can automatically generate example models to run in Escape. There are two ways to run the example models:</p>
-<div class="section" title="Creating a New Escape Project">
-<div class="titlepage">
-<div>
-<div>
-<h5 class="title">
-<a name="Creating_a_New_Escape_Project"></a>Creating a New Escape Project</h5>
-</div>
-</div>
-</div>
-<p>The best option is to simply create a new Escape project and drag the models into it!</p>
-<div class="orderedlist">
-<ol class="orderedlist" type="1">
-<li class="listitem">
-<p>If you're not already there, open the Agent Modeling Perspective. Select Window &gt; Open Perspective &gt; Other.. and then Agent Modeling. (Or you can choose Window &gt; Reset Perspective and the Agent Modeling perspective should appear in the Open Perspective list itself.)</p>
-</li>
-<li class="listitem">
-<p>Next, let's create the project where we'll place our model. Select File &gt; New &gt; Escape AMF Project. Give it a name like "escape.tutorial", then click Finish.</p>
-</li>
-<li class="listitem">
-<p>Finally grab the Epidemic.metaabm model at 
-									<a class="ulink" href="http://download.eclipse.org/amp/models/Epidemic.metaabm" target="_new">http://download.eclipse.org/amp/models/Epidemic.metaabm</a> and drag it into the project. (Depending on your browser the file may load as text directly into your browser, in which case just right-click on the link and save it to a file.)
-								</p>
-</li>
-</ol>
-</div>
-</div>
-</div>
-</div>
-<div class="section" title="Tutorial">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Tutorial"></a>Tutorial</h3>
-</div>
-</div>
-</div>
-<p>We've developer have a complete cheat sheet supporting this tutorial. Simply go to 
-					<span class="bold"><strong>Help &gt; Cheat Sheets...</strong></span> and then select "Run an Example Model" from within the "Agent Modeling" category.
-				</p>
-<div class="section" title="Next Steps">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="Next_Steps"></a>Next Steps</h4>
-</div>
-</div>
-</div>
-<p>To understand the capabilities of AMF, you might also want to try out running the same models automatically generated for Ascape or Repast.</p>
-<div class="literallayout">
-<p>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape<br>
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast<br>
-
-</p>
-</div>
-</div>
-</div>
-<div class="section" title="Classic Java ABM Models">
-<div class="titlepage">
-<div>
-<div>
-<h3 class="title">
-<a name="Classic_Java_ABM_Models"></a>Classic Java ABM Models</h3>
-</div>
-</div>
-</div>
-<p>Many models have been created using Ascape over the years, including all of the classic models created at Brookings and some other cool models such as Craig Reynold's Boids and a pretty cool little traffic model, and they've all been converted to run in Escape. They're in Java but you can execute and explore them in exactly the same way as the Epidemic model above. All of the Ascape example models have been converted (a straightforward process) from their intial Ascape incarnations. For licensing reasons (they're BSD, not EPL) we can't host them directly on the Eclipse site.  You can get the projects in two ways:</p>
-<p>Once you've downloaded the projects, open up the src folder and navigate to the Java files for the actual models. For example, to run Conway's Life, you'll want src/edu.brook.life.ConwayLife. Right-click on the Java file and select "Execute". There are many models to explore! (It's not always obvious which Java files are for models, so you may have to poke around a bit. We need to put together a catalog here. Another nice opportunity for user contributions.)</p>
-</div>
-</div>
-</div>
-<div class="navfooter">
-<hr>
-<table summary="Navigation footer" width="100%">
-<tr>
-<td align="left" width="40%"><a accesskey="p" href="Tutorials.html">Prev</a>&nbsp;</td><td align="center" width="20%">&nbsp;</td><td align="right" width="40%">&nbsp;<a accesskey="n" href="Resources.html">Next</a></td>
-</tr>
-<tr>
-<td valign="top" align="left" width="40%">Chapter&nbsp;4.&nbsp;Tutorials&nbsp;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td valign="top" align="right" width="40%">&nbsp;Chapter&nbsp;6.&nbsp;Resources</td>
-</tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Resources.html b/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Resources.html
deleted file mode 100644
index ca7e0d5..0000000
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/html/Resources.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Chapter&nbsp;6.&nbsp;Resources</title>
-<link href="book.css" rel="stylesheet" type="text/css">
-<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
-<link rel="home" href="index.html" title="Agent Modeling Guide">
-<link rel="up" href="index.html" title="Agent Modeling Guide">
-<link rel="prev" href="Programer_Guide.html" title="Chapter&nbsp;5.&nbsp;Programer Guide">
-<link rel="next" href="Support.html" title="Chapter&nbsp;7.&nbsp;Support">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<div class="navheader">
-<table summary="Navigation header" width="100%">
-<tr>
-<th align="center" colspan="3">Chapter&nbsp;6.&nbsp;Resources</th>
-</tr>
-<tr>
-<td align="left" width="20%"><a accesskey="p" href="Programer_Guide.html">Prev</a>&nbsp;</td><th align="center" width="60%">&nbsp;</th><td align="right" width="20%">&nbsp;<a accesskey="n" href="Support.html">Next</a></td>
-</tr>
-</table>
-<hr>
-</div>
-<div class="chapter" title="Chapter&nbsp;6.&nbsp;Resources">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title">
-<a name="Resources"></a>Chapter&nbsp;6.&nbsp;Resources</h2>
-</div>
-</div>
-</div>
-<div class="toc">
-<dl>
-<dt>
-<span class="section"><a href="Resources.html#Obtaining_Example_Models">Obtaining Example Models</a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Resources.html#Import_from_CVS"></a></span>
-</dt>
-<dd>
-<dl>
-<dt>
-<span class="section"><a href="Resources.html#N111AE">Import from CVS</a></span>
-</dt>
-</dl>
-</dd>
-</dl>
-</dd>
-<dt>
-<span class="section"><a href="Resources.html#Websites">Websites</a></span>
-</dt>
-<dt>
-<span class="section"><a href="Resources.html#Papers">Papers</a></span>
-</dt>
-</dl>
-</div>
-<div class="section" title="Obtaining Example Models">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Obtaining_Example_Models"></a>Obtaining Example Models</h2>
-</div>
-</div>
-</div>
-<p>There is a cheat-sheet available for obtaining the example models. If you would rather obtain them yourself, here is the CVS information:</p>
-<div class="section">
-<div class="titlepage"></div>
-<div class="section" title="Import from CVS">
-<div class="titlepage">
-<div>
-<div>
-<h4 class="title">
-<a name="N111AE"></a>Import from CVS</h4>
-</div>
-</div>
-</div>
-<div class="itemizedlist">
-<ul class="itemizedlist" type="disc">
-<li class="listitem">
-<p>Import the CVS projects from the AMP project repository. For help, see 
-								<a class="ulink" href="http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.platform.doc.user/reference/ref-40a.htm" target="_new">this page</a>. For repository details, see 
-								<a class="ulink" href="http://eclipse.org/amp/developers/repositoryDetails.php" target="_new">http://eclipse.org/amp/developers/repositoryDetails.php</a>. These are the example projects:
-							</p>
-</li>
-</ul>
-</div>
-<div class="literallayout">
-<p>org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.ascape&nbsp;<br>
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.escape&nbsp;<br>
-org.eclipse.amp/org.eclipse.amp.amf/examples/org.eclipse.amp.amf.examples.repast&nbsp;<br>
-
-</p>
-</div>
-<div class="itemizedlist">
-<ul class="itemizedlist" type="disc">
-<li class="listitem">
-<p>Right-click on the models to execute them.</p>
-</li>
-<li class="listitem">
-<p>Play around with the model attribute settings and behavior (Acts).</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="section" title="Websites">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Websites"></a>Websites</h2>
-</div>
-</div>
-</div>
-<p>
-				
-<a class="ulink" href="http://www.eclipse.org/amp" target="_new">Eclipse Agent Modeling Project (Incubation)</a>
-			
-</p>
-<p>
-				
-<a class="ulink" href="http://ascape.sourceforge.net" target="_new">Ascape</a>
-			
-</p>
-<p>
-				
-<a class="ulink" href="http://metascapeabm.com" target="_new">Metascape, LLC</a>
-			
-</p>
-</div>
-<div class="section" title="Papers">
-<div class="titlepage">
-<div>
-<div>
-<h2 class="title" style="clear: both">
-<a name="Papers"></a>Papers</h2>
-</div>
-</div>
-</div>
-<p>
-				
-<a class="ulink" href="http://www.pnas.org/content/99/suppl.3/7304.full" target="_new">Ascape</a>
-
-				<a class="ulink" href="http://www.pnas.org/content/99/suppl.3/7280.full" target="_new">Agent-Based Modeling</a>
-
-				<a class="ulink" href="http://jasss.soc.surrey.ac.uk/11/4/12.html" target="_new">Why Model?</a>
-			
-</p>
-</div>
-</div>
-<div class="navfooter">
-<hr>
-<table summary="Navigation footer" width="100%">
-<tr>
-<td align="left" width="40%"><a accesskey="p" href="Programer_Guide.html">Prev</a>&nbsp;</td><td align="center" width="20%">&nbsp;</td><td align="right" width="40%">&nbsp;<a accesskey="n" href="Support.html">Next</a></td>
-</tr>
-<tr>
-<td valign="top" align="left" width="40%">Chapter&nbsp;5.&nbsp;Programer Guide&nbsp;</td><td align="c