Added Simulink driver
diff --git a/examples/org.eclipse.epsilon.emc.simulink.examples/.project b/examples/org.eclipse.epsilon.emc.simulink.examples/.project
new file mode 100644
index 0000000..5a89e42
--- /dev/null
+++ b/examples/org.eclipse.epsilon.emc.simulink.examples/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.epsilon.emc.simulink.examples</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/examples/org.eclipse.epsilon.emc.simulink.examples/createFeedbackController.eol b/examples/org.eclipse.epsilon.emc.simulink.examples/createFeedbackController.eol
new file mode 100644
index 0000000..1015a5b
--- /dev/null
+++ b/examples/org.eclipse.epsilon.emc.simulink.examples/createFeedbackController.eol
@@ -0,0 +1,37 @@
+var reference = new `simulink/Sources/Step`;
+var controller = new `simulink/Ports & Subsystems/Subsystem`;
+var plant = new `simulink/Ports & Subsystems/Subsystem`;
+var sum = new `simulink/Math Operations/Sum`;
+
+reference.name = "Reference";
+controller.name = "Controller";
+plant.name = "Plant";
+
+// Position them on the diagram
+reference.position = "[100 100 130 130]";
+sum.position = "[200 100 230 130]";
+controller.position = "[300 100 400 130]";
+plant.position = "[500 100 600 130]";
+
+// Controller subsystem
+var pidController = new `simulink/Continuous/PID Controller`;
+pidController.name = "PID Controller";
+pidController.parent = controller;
+
+var error = Inport.all.selectOne(ip|ip.parent = controller and ip.name="In1");
+error.name = "Error";
+var control = Outport.all.selectOne(op|op.parent = controller and op.name="Out1");
+control.name = "Control";
+error.unlink(control);
+error.link(pidController);
+pidController.link(control);
+
+// Plant subsystem
+var transferFcn = new `simulink/Continuous/Transfer Fcn`;
+transferFcn.parent = plant;
+// to be continued
+
+reference.link(sum);
+sum.link(controller);
+controller.link(plant);
+plant.linkTo(sum, 2);
\ No newline at end of file
diff --git a/examples/org.eclipse.epsilon.emc.simulink.examples/createFeedbackController.launch b/examples/org.eclipse.epsilon.emc.simulink.examples/createFeedbackController.launch
new file mode 100644
index 0000000..e4dfa34
--- /dev/null
+++ b/examples/org.eclipse.epsilon.emc.simulink.examples/createFeedbackController.launch
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.epsilon.eol.eclipse.dt.launching.EolLaunchConfigurationDelegate">
+<booleanAttribute key="fine_grained_profiling" value="false"/>
+<listAttribute key="models">
+<listEntry value="aliases=&#10;name=M&#10;file=/org.eclipse.epsilon.emc.simulink.examples/feedbackController.slx&#10;cached=false&#10;type=Simulink&#10;storeOnDisposal=false&#10;readOnLoad=false"/>
+</listAttribute>
+<listAttribute key="parameters"/>
+<booleanAttribute key="profile_model_loading" value="false"/>
+<booleanAttribute key="profiling_enabled" value="false"/>
+<booleanAttribute key="reset_profiler" value="false"/>
+<stringAttribute key="source" value="/org.eclipse.epsilon.emc.simulink.examples/createFeedbackController.eol"/>
+</launchConfiguration>
diff --git a/examples/org.eclipse.epsilon.emc.simulink.examples/createSimpleSimulation.eol b/examples/org.eclipse.epsilon.emc.simulink.examples/createSimpleSimulation.eol
new file mode 100644
index 0000000..83d9707
--- /dev/null
+++ b/examples/org.eclipse.epsilon.emc.simulink.examples/createSimpleSimulation.eol
@@ -0,0 +1,25 @@
+// Create elements
+var sineWave = new `simulink/Sources/Sine Wave`;
+var gain = new `simulink/Math Operations/Gain`;
+var saturation = new `simulink/Discontinuities/Saturation`;
+var busCreator = new `simulink/Signal Routing/Bus Creator`;
+var scope = new `simulink/Sinks/Scope`;
+
+// Position them on the diagram
+sineWave.position = "[100 100 130 130]";
+gain.position = "[200 100 230 130]";
+saturation.position = "[300 100 330 130]";
+busCreator.position = "[400 70 410 300]";
+scope.position = "[500 175 530 205]";
+
+// Set their properties
+gain.gain = 2;
+busCreator.inputs = 3;
+
+// Link them
+sineWave.link(gain);
+gain.link(saturation);
+saturation.link(busCreator);
+gain.linkTo(busCreator, 2);
+sineWave.linkTo(busCreator, 3);
+busCreator.link(scope);
\ No newline at end of file
diff --git a/examples/org.eclipse.epsilon.emc.simulink.examples/createSimpleSimulation.launch b/examples/org.eclipse.epsilon.emc.simulink.examples/createSimpleSimulation.launch
new file mode 100644
index 0000000..38b1cbd
--- /dev/null
+++ b/examples/org.eclipse.epsilon.emc.simulink.examples/createSimpleSimulation.launch
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.epsilon.eol.eclipse.dt.launching.EolLaunchConfigurationDelegate">
+<booleanAttribute key="fine_grained_profiling" value="false"/>
+<listAttribute key="models">
+<listEntry value="aliases=&#10;name=M&#10;file=/org.eclipse.epsilon.emc.simulink.examples/simpleSimulation.slx&#10;cached=true&#10;type=Simulink&#10;storeOnDisposal=false&#10;readOnLoad=false"/>
+</listAttribute>
+<listAttribute key="parameters"/>
+<booleanAttribute key="profile_model_loading" value="false"/>
+<booleanAttribute key="profiling_enabled" value="false"/>
+<booleanAttribute key="reset_profiler" value="false"/>
+<stringAttribute key="source" value="/org.eclipse.epsilon.emc.simulink.examples/createSimpleSimulation.eol"/>
+</launchConfiguration>
diff --git a/features/org.eclipse.epsilon.simulink.dt.feature/.project b/features/org.eclipse.epsilon.simulink.dt.feature/.project
new file mode 100644
index 0000000..f7b530a
--- /dev/null
+++ b/features/org.eclipse.epsilon.simulink.dt.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.epsilon.simulink.dt.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/org.eclipse.epsilon.simulink.dt.feature/build.properties b/features/org.eclipse.epsilon.simulink.dt.feature/build.properties
new file mode 100644
index 0000000..82ab19c
--- /dev/null
+++ b/features/org.eclipse.epsilon.simulink.dt.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml

diff --git a/features/org.eclipse.epsilon.simulink.dt.feature/epl-v10.html b/features/org.eclipse.epsilon.simulink.dt.feature/epl-v10.html
new file mode 100644
index 0000000..813c07d
--- /dev/null
+++ b/features/org.eclipse.epsilon.simulink.dt.feature/epl-v10.html
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

+<title>Eclipse Public License - Version 1.0</title>

+<style type="text/css">

+  body {

+    size: 8.5in 11.0in;

+    margin: 0.25in 0.5in 0.25in 0.5in;

+    tab-interval: 0.5in;

+    }

+  p {  	

+    margin-left: auto;

+    margin-top:  0.5em;

+    margin-bottom: 0.5em;

+    }

+  p.list {

+  	margin-left: 0.5in;

+    margin-top:  0.05em;

+    margin-bottom: 0.05em;

+    }

+  </style>

+

+</head>

+

+<body lang="EN-US">

+

+<p align=center><b>Eclipse Public License - v 1.0</b></p>

+

+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

+AGREEMENT.</p>

+

+<p><b>1. DEFINITIONS</b></p>

+

+<p>&quot;Contribution&quot; means:</p>

+

+<p class="list">a) in the case of the initial Contributor, the initial

+code and documentation distributed under this Agreement, and</p>

+<p class="list">b) in the case of each subsequent Contributor:</p>

+<p class="list">i) changes to the Program, and</p>

+<p class="list">ii) additions to the Program;</p>

+<p class="list">where such changes and/or additions to the Program

+originate from and are distributed by that particular Contributor. A

+Contribution 'originates' from a Contributor if it was added to the

+Program by such Contributor itself or anyone acting on such

+Contributor's behalf. Contributions do not include additions to the

+Program which: (i) are separate modules of software distributed in

+conjunction with the Program under their own license agreement, and (ii)

+are not derivative works of the Program.</p>

+

+<p>&quot;Contributor&quot; means any person or entity that distributes

+the Program.</p>

+

+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

+Contributor which are necessarily infringed by the use or sale of its

+Contribution alone or when combined with the Program.</p>

+

+<p>&quot;Program&quot; means the Contributions distributed in accordance

+with this Agreement.</p>

+

+<p>&quot;Recipient&quot; means anyone who receives the Program under

+this Agreement, including all Contributors.</p>

+

+<p><b>2. GRANT OF RIGHTS</b></p>

+

+<p class="list">a) Subject to the terms of this Agreement, each

+Contributor hereby grants Recipient a non-exclusive, worldwide,

+royalty-free copyright license to reproduce, prepare derivative works

+of, publicly display, publicly perform, distribute and sublicense the

+Contribution of such Contributor, if any, and such derivative works, in

+source code and object code form.</p>

+

+<p class="list">b) Subject to the terms of this Agreement, each

+Contributor hereby grants Recipient a non-exclusive, worldwide,

+royalty-free patent license under Licensed Patents to make, use, sell,

+offer to sell, import and otherwise transfer the Contribution of such

+Contributor, if any, in source code and object code form. This patent

+license shall apply to the combination of the Contribution and the

+Program if, at the time the Contribution is added by the Contributor,

+such addition of the Contribution causes such combination to be covered

+by the Licensed Patents. The patent license shall not apply to any other

+combinations which include the Contribution. No hardware per se is

+licensed hereunder.</p>

+

+<p class="list">c) Recipient understands that although each Contributor

+grants the licenses to its Contributions set forth herein, no assurances

+are provided by any Contributor that the Program does not infringe the

+patent or other intellectual property rights of any other entity. Each

+Contributor disclaims any liability to Recipient for claims brought by

+any other entity based on infringement of intellectual property rights

+or otherwise. As a condition to exercising the rights and licenses

+granted hereunder, each Recipient hereby assumes sole responsibility to

+secure any other intellectual property rights needed, if any. For

+example, if a third party patent license is required to allow Recipient

+to distribute the Program, it is Recipient's responsibility to acquire

+that license before distributing the Program.</p>

+

+<p class="list">d) Each Contributor represents that to its knowledge it

+has sufficient copyright rights in its Contribution, if any, to grant

+the copyright license set forth in this Agreement.</p>

+

+<p><b>3. REQUIREMENTS</b></p>

+

+<p>A Contributor may choose to distribute the Program in object code

+form under its own license agreement, provided that:</p>

+

+<p class="list">a) it complies with the terms and conditions of this

+Agreement; and</p>

+

+<p class="list">b) its license agreement:</p>

+

+<p class="list">i) effectively disclaims on behalf of all Contributors

+all warranties and conditions, express and implied, including warranties

+or conditions of title and non-infringement, and implied warranties or

+conditions of merchantability and fitness for a particular purpose;</p>

+

+<p class="list">ii) effectively excludes on behalf of all Contributors

+all liability for damages, including direct, indirect, special,

+incidental and consequential damages, such as lost profits;</p>

+

+<p class="list">iii) states that any provisions which differ from this

+Agreement are offered by that Contributor alone and not by any other

+party; and</p>

+

+<p class="list">iv) states that source code for the Program is available

+from such Contributor, and informs licensees how to obtain it in a

+reasonable manner on or through a medium customarily used for software

+exchange.</p>

+

+<p>When the Program is made available in source code form:</p>

+

+<p class="list">a) it must be made available under this Agreement; and</p>

+

+<p class="list">b) a copy of this Agreement must be included with each

+copy of the Program.</p>

+

+<p>Contributors may not remove or alter any copyright notices contained

+within the Program.</p>

+

+<p>Each Contributor must identify itself as the originator of its

+Contribution, if any, in a manner that reasonably allows subsequent

+Recipients to identify the originator of the Contribution.</p>

+

+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

+

+<p>Commercial distributors of software may accept certain

+responsibilities with respect to end users, business partners and the

+like. While this license is intended to facilitate the commercial use of

+the Program, the Contributor who includes the Program in a commercial

+product offering should do so in a manner which does not create

+potential liability for other Contributors. Therefore, if a Contributor

+includes the Program in a commercial product offering, such Contributor

+(&quot;Commercial Contributor&quot;) hereby agrees to defend and

+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

+against any losses, damages and costs (collectively &quot;Losses&quot;)

+arising from claims, lawsuits and other legal actions brought by a third

+party against the Indemnified Contributor to the extent caused by the

+acts or omissions of such Commercial Contributor in connection with its

+distribution of the Program in a commercial product offering. The

+obligations in this section do not apply to any claims or Losses

+relating to any actual or alleged intellectual property infringement. In

+order to qualify, an Indemnified Contributor must: a) promptly notify

+the Commercial Contributor in writing of such claim, and b) allow the

+Commercial Contributor to control, and cooperate with the Commercial

+Contributor in, the defense and any related settlement negotiations. The

+Indemnified Contributor may participate in any such claim at its own

+expense.</p>

+

+<p>For example, a Contributor might include the Program in a commercial

+product offering, Product X. That Contributor is then a Commercial

+Contributor. If that Commercial Contributor then makes performance

+claims, or offers warranties related to Product X, those performance

+claims and warranties are such Commercial Contributor's responsibility

+alone. Under this section, the Commercial Contributor would have to

+defend claims against the other Contributors related to those

+performance claims and warranties, and if a court requires any other

+Contributor to pay any damages as a result, the Commercial Contributor

+must pay those damages.</p>

+

+<p><b>5. NO WARRANTY</b></p>

+

+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

+responsible for determining the appropriateness of using and

+distributing the Program and assumes all risks associated with its

+exercise of rights under this Agreement , including but not limited to

+the risks and costs of program errors, compliance with applicable laws,

+damage to or loss of data, programs or equipment, and unavailability or

+interruption of operations.</p>

+

+<p><b>6. DISCLAIMER OF LIABILITY</b></p>

+

+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

+

+<p><b>7. GENERAL</b></p>

+

+<p>If any provision of this Agreement is invalid or unenforceable under

+applicable law, it shall not affect the validity or enforceability of

+the remainder of the terms of this Agreement, and without further action

+by the parties hereto, such provision shall be reformed to the minimum

+extent necessary to make such provision valid and enforceable.</p>

+

+<p>If Recipient institutes patent litigation against any entity

+(including a cross-claim or counterclaim in a lawsuit) alleging that the

+Program itself (excluding combinations of the Program with other

+software or hardware) infringes such Recipient's patent(s), then such

+Recipient's rights granted under Section 2(b) shall terminate as of the

+date such litigation is filed.</p>

+

+<p>All Recipient's rights under this Agreement shall terminate if it

+fails to comply with any of the material terms or conditions of this

+Agreement and does not cure such failure in a reasonable period of time

+after becoming aware of such noncompliance. If all Recipient's rights

+under this Agreement terminate, Recipient agrees to cease use and

+distribution of the Program as soon as reasonably practicable. However,

+Recipient's obligations under this Agreement and any licenses granted by

+Recipient relating to the Program shall continue and survive.</p>

+

+<p>Everyone is permitted to copy and distribute copies of this

+Agreement, but in order to avoid inconsistency the Agreement is

+copyrighted and may only be modified in the following manner. The

+Agreement Steward reserves the right to publish new versions (including

+revisions) of this Agreement from time to time. No one other than the

+Agreement Steward has the right to modify this Agreement. The Eclipse

+Foundation is the initial Agreement Steward. The Eclipse Foundation may

+assign the responsibility to serve as the Agreement Steward to a

+suitable separate entity. Each new version of the Agreement will be

+given a distinguishing version number. The Program (including

+Contributions) may always be distributed subject to the version of the

+Agreement under which it was received. In addition, after a new version

+of the Agreement is published, Contributor may elect to distribute the

+Program (including its Contributions) under the new version. Except as

+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

+rights or licenses to the intellectual property of any Contributor under

+this Agreement, whether expressly, by implication, estoppel or

+otherwise. All rights in the Program not expressly granted under this

+Agreement are reserved.</p>

+

+<p>This Agreement is governed by the laws of the State of New York and

+the intellectual property laws of the United States of America. No party

+to this Agreement will bring a legal action under this Agreement more

+than one year after the cause of action arose. Each party waives its

+rights to a jury trial in any resulting litigation.</p>

+

+</body>

+

+</html>

diff --git a/features/org.eclipse.epsilon.simulink.dt.feature/feature.xml b/features/org.eclipse.epsilon.simulink.dt.feature/feature.xml
new file mode 100644
index 0000000..cbec21b
--- /dev/null
+++ b/features/org.eclipse.epsilon.simulink.dt.feature/feature.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.epsilon.simulink.dt.feature"
+      label="Epsilon Development Tools for Simulink"
+      version="1.5.0.qualifier"
+      provider-name="Eclipse Modeling Project">
+
+   <description url="http://www.eclipse.org/epsilon">
+      This feature provides the Epsilon development tools needed to
+work with Simulink models.
+   </description>
+
+   <copyright>
+      Please refer to the Licence Agreement.
+   </copyright>
+
+   <license url="http://www.eclipse.org/legal/epl-v10.html">
+      Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+&quot;Contribution&quot; means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+&quot;Contributor&quot; means any person or entity that distributes the Program.
+
+&quot;Licensed Patents &quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
+
+&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+b) its license agreement:
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+b) a copy of this Agreement must be included with each copy of the Program.
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+   </license>
+
+   <url>
+      <discovery label="Epsilon Update Site (Stable)" url="http://download.eclipse.org/epsilon/updates/"/>
+      <discovery label="Epsilon Update Site (Interim)" url="http://download.eclipse.org/epsilon/interim/"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.epsilon.common.dt"/>
+      <import plugin="org.eclipse.epsilon.emc.simulink"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.epsilon.emc.simulink.dt"
+         download-size="0"
+         install-size="0"
+         version="1.5.0.qualifier"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.epsilon.simulink.dt.feature/pom.xml b/features/org.eclipse.epsilon.simulink.dt.feature/pom.xml
new file mode 100644
index 0000000..4a55930
--- /dev/null
+++ b/features/org.eclipse.epsilon.simulink.dt.feature/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.epsilon</groupId>
+    <artifactId>features</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse.epsilon</groupId>
+  <artifactId>org.eclipse.epsilon.simulink.dt.feature</artifactId>
+  <version>1.5.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/org.eclipse.epsilon.simulink.feature/.project b/features/org.eclipse.epsilon.simulink.feature/.project
new file mode 100644
index 0000000..822e91d
--- /dev/null
+++ b/features/org.eclipse.epsilon.simulink.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.epsilon.simulink.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/org.eclipse.epsilon.simulink.feature/build.properties b/features/org.eclipse.epsilon.simulink.feature/build.properties
new file mode 100644
index 0000000..82ab19c
--- /dev/null
+++ b/features/org.eclipse.epsilon.simulink.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml

diff --git a/features/org.eclipse.epsilon.simulink.feature/epl-v10.html b/features/org.eclipse.epsilon.simulink.feature/epl-v10.html
new file mode 100644
index 0000000..813c07d
--- /dev/null
+++ b/features/org.eclipse.epsilon.simulink.feature/epl-v10.html
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

+<title>Eclipse Public License - Version 1.0</title>

+<style type="text/css">

+  body {

+    size: 8.5in 11.0in;

+    margin: 0.25in 0.5in 0.25in 0.5in;

+    tab-interval: 0.5in;

+    }

+  p {  	

+    margin-left: auto;

+    margin-top:  0.5em;

+    margin-bottom: 0.5em;

+    }

+  p.list {

+  	margin-left: 0.5in;

+    margin-top:  0.05em;

+    margin-bottom: 0.05em;

+    }

+  </style>

+

+</head>

+

+<body lang="EN-US">

+

+<p align=center><b>Eclipse Public License - v 1.0</b></p>

+

+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR

+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS

+AGREEMENT.</p>

+

+<p><b>1. DEFINITIONS</b></p>

+

+<p>&quot;Contribution&quot; means:</p>

+

+<p class="list">a) in the case of the initial Contributor, the initial

+code and documentation distributed under this Agreement, and</p>

+<p class="list">b) in the case of each subsequent Contributor:</p>

+<p class="list">i) changes to the Program, and</p>

+<p class="list">ii) additions to the Program;</p>

+<p class="list">where such changes and/or additions to the Program

+originate from and are distributed by that particular Contributor. A

+Contribution 'originates' from a Contributor if it was added to the

+Program by such Contributor itself or anyone acting on such

+Contributor's behalf. Contributions do not include additions to the

+Program which: (i) are separate modules of software distributed in

+conjunction with the Program under their own license agreement, and (ii)

+are not derivative works of the Program.</p>

+

+<p>&quot;Contributor&quot; means any person or entity that distributes

+the Program.</p>

+

+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a

+Contributor which are necessarily infringed by the use or sale of its

+Contribution alone or when combined with the Program.</p>

+

+<p>&quot;Program&quot; means the Contributions distributed in accordance

+with this Agreement.</p>

+

+<p>&quot;Recipient&quot; means anyone who receives the Program under

+this Agreement, including all Contributors.</p>

+

+<p><b>2. GRANT OF RIGHTS</b></p>

+

+<p class="list">a) Subject to the terms of this Agreement, each

+Contributor hereby grants Recipient a non-exclusive, worldwide,

+royalty-free copyright license to reproduce, prepare derivative works

+of, publicly display, publicly perform, distribute and sublicense the

+Contribution of such Contributor, if any, and such derivative works, in

+source code and object code form.</p>

+

+<p class="list">b) Subject to the terms of this Agreement, each

+Contributor hereby grants Recipient a non-exclusive, worldwide,

+royalty-free patent license under Licensed Patents to make, use, sell,

+offer to sell, import and otherwise transfer the Contribution of such

+Contributor, if any, in source code and object code form. This patent

+license shall apply to the combination of the Contribution and the

+Program if, at the time the Contribution is added by the Contributor,

+such addition of the Contribution causes such combination to be covered

+by the Licensed Patents. The patent license shall not apply to any other

+combinations which include the Contribution. No hardware per se is

+licensed hereunder.</p>

+

+<p class="list">c) Recipient understands that although each Contributor

+grants the licenses to its Contributions set forth herein, no assurances

+are provided by any Contributor that the Program does not infringe the

+patent or other intellectual property rights of any other entity. Each

+Contributor disclaims any liability to Recipient for claims brought by

+any other entity based on infringement of intellectual property rights

+or otherwise. As a condition to exercising the rights and licenses

+granted hereunder, each Recipient hereby assumes sole responsibility to

+secure any other intellectual property rights needed, if any. For

+example, if a third party patent license is required to allow Recipient

+to distribute the Program, it is Recipient's responsibility to acquire

+that license before distributing the Program.</p>

+

+<p class="list">d) Each Contributor represents that to its knowledge it

+has sufficient copyright rights in its Contribution, if any, to grant

+the copyright license set forth in this Agreement.</p>

+

+<p><b>3. REQUIREMENTS</b></p>

+

+<p>A Contributor may choose to distribute the Program in object code

+form under its own license agreement, provided that:</p>

+

+<p class="list">a) it complies with the terms and conditions of this

+Agreement; and</p>

+

+<p class="list">b) its license agreement:</p>

+

+<p class="list">i) effectively disclaims on behalf of all Contributors

+all warranties and conditions, express and implied, including warranties

+or conditions of title and non-infringement, and implied warranties or

+conditions of merchantability and fitness for a particular purpose;</p>

+

+<p class="list">ii) effectively excludes on behalf of all Contributors

+all liability for damages, including direct, indirect, special,

+incidental and consequential damages, such as lost profits;</p>

+

+<p class="list">iii) states that any provisions which differ from this

+Agreement are offered by that Contributor alone and not by any other

+party; and</p>

+

+<p class="list">iv) states that source code for the Program is available

+from such Contributor, and informs licensees how to obtain it in a

+reasonable manner on or through a medium customarily used for software

+exchange.</p>

+

+<p>When the Program is made available in source code form:</p>

+

+<p class="list">a) it must be made available under this Agreement; and</p>

+

+<p class="list">b) a copy of this Agreement must be included with each

+copy of the Program.</p>

+

+<p>Contributors may not remove or alter any copyright notices contained

+within the Program.</p>

+

+<p>Each Contributor must identify itself as the originator of its

+Contribution, if any, in a manner that reasonably allows subsequent

+Recipients to identify the originator of the Contribution.</p>

+

+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>

+

+<p>Commercial distributors of software may accept certain

+responsibilities with respect to end users, business partners and the

+like. While this license is intended to facilitate the commercial use of

+the Program, the Contributor who includes the Program in a commercial

+product offering should do so in a manner which does not create

+potential liability for other Contributors. Therefore, if a Contributor

+includes the Program in a commercial product offering, such Contributor

+(&quot;Commercial Contributor&quot;) hereby agrees to defend and

+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)

+against any losses, damages and costs (collectively &quot;Losses&quot;)

+arising from claims, lawsuits and other legal actions brought by a third

+party against the Indemnified Contributor to the extent caused by the

+acts or omissions of such Commercial Contributor in connection with its

+distribution of the Program in a commercial product offering. The

+obligations in this section do not apply to any claims or Losses

+relating to any actual or alleged intellectual property infringement. In

+order to qualify, an Indemnified Contributor must: a) promptly notify

+the Commercial Contributor in writing of such claim, and b) allow the

+Commercial Contributor to control, and cooperate with the Commercial

+Contributor in, the defense and any related settlement negotiations. The

+Indemnified Contributor may participate in any such claim at its own

+expense.</p>

+

+<p>For example, a Contributor might include the Program in a commercial

+product offering, Product X. That Contributor is then a Commercial

+Contributor. If that Commercial Contributor then makes performance

+claims, or offers warranties related to Product X, those performance

+claims and warranties are such Commercial Contributor's responsibility

+alone. Under this section, the Commercial Contributor would have to

+defend claims against the other Contributors related to those

+performance claims and warranties, and if a court requires any other

+Contributor to pay any damages as a result, the Commercial Contributor

+must pay those damages.</p>

+

+<p><b>5. NO WARRANTY</b></p>

+

+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS

+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,

+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

+responsible for determining the appropriateness of using and

+distributing the Program and assumes all risks associated with its

+exercise of rights under this Agreement , including but not limited to

+the risks and costs of program errors, compliance with applicable laws,

+damage to or loss of data, programs or equipment, and unavailability or

+interruption of operations.</p>

+

+<p><b>6. DISCLAIMER OF LIABILITY</b></p>

+

+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT

+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>

+

+<p><b>7. GENERAL</b></p>

+

+<p>If any provision of this Agreement is invalid or unenforceable under

+applicable law, it shall not affect the validity or enforceability of

+the remainder of the terms of this Agreement, and without further action

+by the parties hereto, such provision shall be reformed to the minimum

+extent necessary to make such provision valid and enforceable.</p>

+

+<p>If Recipient institutes patent litigation against any entity

+(including a cross-claim or counterclaim in a lawsuit) alleging that the

+Program itself (excluding combinations of the Program with other

+software or hardware) infringes such Recipient's patent(s), then such

+Recipient's rights granted under Section 2(b) shall terminate as of the

+date such litigation is filed.</p>

+

+<p>All Recipient's rights under this Agreement shall terminate if it

+fails to comply with any of the material terms or conditions of this

+Agreement and does not cure such failure in a reasonable period of time

+after becoming aware of such noncompliance. If all Recipient's rights

+under this Agreement terminate, Recipient agrees to cease use and

+distribution of the Program as soon as reasonably practicable. However,

+Recipient's obligations under this Agreement and any licenses granted by

+Recipient relating to the Program shall continue and survive.</p>

+

+<p>Everyone is permitted to copy and distribute copies of this

+Agreement, but in order to avoid inconsistency the Agreement is

+copyrighted and may only be modified in the following manner. The

+Agreement Steward reserves the right to publish new versions (including

+revisions) of this Agreement from time to time. No one other than the

+Agreement Steward has the right to modify this Agreement. The Eclipse

+Foundation is the initial Agreement Steward. The Eclipse Foundation may

+assign the responsibility to serve as the Agreement Steward to a

+suitable separate entity. Each new version of the Agreement will be

+given a distinguishing version number. The Program (including

+Contributions) may always be distributed subject to the version of the

+Agreement under which it was received. In addition, after a new version

+of the Agreement is published, Contributor may elect to distribute the

+Program (including its Contributions) under the new version. Except as

+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no

+rights or licenses to the intellectual property of any Contributor under

+this Agreement, whether expressly, by implication, estoppel or

+otherwise. All rights in the Program not expressly granted under this

+Agreement are reserved.</p>

+

+<p>This Agreement is governed by the laws of the State of New York and

+the intellectual property laws of the United States of America. No party

+to this Agreement will bring a legal action under this Agreement more

+than one year after the cause of action arose. Each party waives its

+rights to a jury trial in any resulting litigation.</p>

+

+</body>

+

+</html>

diff --git a/features/org.eclipse.epsilon.simulink.feature/feature.xml b/features/org.eclipse.epsilon.simulink.feature/feature.xml
new file mode 100644
index 0000000..228cee9
--- /dev/null
+++ b/features/org.eclipse.epsilon.simulink.feature/feature.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.epsilon.simulink.feature"
+      label="Epsilon Simulink Integration"
+      version="1.5.0.qualifier"
+      provider-name="Eclipse Modeling Project">
+
+   <description url="http://www.eclipse.org/epsilon">
+      This feature provides the Epsilon Model Connectivity driver for
+Simulink models. This driver is required in order to work with Simulink
+models in Epsilon.
+   </description>
+
+   <copyright>
+      Please refer to the Licence Agreement.
+   </copyright>
+
+   <license url="http://www.eclipse.org/legal/epl-v10.html">
+      Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+&quot;Contribution&quot; means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+&quot;Contributor&quot; means any person or entity that distributes the Program.
+
+&quot;Licensed Patents &quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
+
+&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+b) its license agreement:
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+b) a copy of this Agreement must be included with each copy of the Program.
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+   </license>
+
+   <url>
+      <discovery label="Epsilon Update Site (Stable)" url="http://download.eclipse.org/epsilon/updates/"/>
+      <discovery label="Epsilon Update Site (Interim)" url="http://download.eclipse.org/epsilon/interim/"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.epsilon.eol.engine"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.epsilon.emc.simulink"
+         download-size="0"
+         install-size="0"
+         version="1.5.0.qualifier"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.epsilon.simulink.feature/pom.xml b/features/org.eclipse.epsilon.simulink.feature/pom.xml
new file mode 100644
index 0000000..3668920
--- /dev/null
+++ b/features/org.eclipse.epsilon.simulink.feature/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.epsilon</groupId>
+    <artifactId>features</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse.epsilon</groupId>
+  <artifactId>org.eclipse.epsilon.simulink.feature</artifactId>
+  <version>1.5.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/pom.xml b/features/pom.xml
index 5075402..b0345d2 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -40,5 +40,7 @@
     <module>org.eclipse.epsilon.hutn.feature</module>
     <module>org.eclipse.epsilon.uml.dt.feature</module>
     <module>org.eclipse.epsilon.uml.feature</module>
+    <module>org.eclipse.epsilon.simulink.dt.feature</module>
+    <module>org.eclipse.epsilon.simulink.feature</module>
   </modules>
 </project>
diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/.classpath b/plugins/org.eclipse.epsilon.emc.simulink.dt/.classpath
new file mode 100644
index 0000000..8a8f166
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/.gitignore b/plugins/org.eclipse.epsilon.emc.simulink.dt/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/.project b/plugins/org.eclipse.epsilon.emc.simulink.dt/.project
new file mode 100644
index 0000000..723cd62
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.epsilon.emc.simulink.dt</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.epsilon.emc.simulink.dt/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..568c5dc
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Wed Mar 17 09:45:44 GMT 2010

+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.6

diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/META-INF/MANIFEST.MF b/plugins/org.eclipse.epsilon.emc.simulink.dt/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..49ba4fc
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EMC Simulink development tools
+Bundle-SymbolicName: org.eclipse.epsilon.emc.simulink.dt;singleton:=true
+Bundle-Version: 1.5.0.qualifier
+Bundle-Activator: org.eclipse.epsilon.emc.simulink.dt.Activator
+Require-Bundle: org.eclipse.epsilon.common.dt,
+ org.eclipse.epsilon.emc.simulink
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.epsilon.emc.simulink.dt
+Bundle-Vendor: Eclipse Modeling Project
diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/build.properties b/plugins/org.eclipse.epsilon.emc.simulink.dt/build.properties
new file mode 100644
index 0000000..b7b8b11
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/build.properties
@@ -0,0 +1,7 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               images/,\

+               src/

diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/images/matlab.png b/plugins/org.eclipse.epsilon.emc.simulink.dt/images/matlab.png
new file mode 100644
index 0000000..b15e52a
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/images/matlab.png
Binary files differ
diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/plugin.xml b/plugins/org.eclipse.epsilon.emc.simulink.dt/plugin.xml
new file mode 100644
index 0000000..86a4caf
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/plugin.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension

+         point="org.eclipse.epsilon.common.dt.modelType">

+      <modelType

+            class="org.eclipse.epsilon.emc.simulink.dt.SimulinkModelInEclipse"

+            dialog="org.eclipse.epsilon.emc.simulink.dt.SimulinkModelConfigurationDialog"

+            icon="images/matlab.png"

+            label="Simulink Model"

+            stable="true"

+            type="Simulink">

+      </modelType>

+   </extension>

+   <extension

+         point="org.eclipse.epsilon.common.dt.modelElementLocator">

+      <modelElementLocator

+            class="org.eclipse.epsilon.emc.simulink.dt.SimulinkModelElementLocator">

+      </modelElementLocator>

+   </extension>

+   <extension

+         point="org.eclipse.ui.preferencePages">

+      <page

+            category="Epsilon"

+            class="org.eclipse.epsilon.emc.simulink.dt.SimulinkModelPreferencePage"

+            id="org.eclipse.epsilon.emc.simulink.dt.SimulinkModelPreferencePage"

+            name="Simulink">

+      </page>

+   </extension>

+

+</plugin>

diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/pom.xml b/plugins/org.eclipse.epsilon.emc.simulink.dt/pom.xml
new file mode 100644
index 0000000..69b784f
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.epsilon</groupId>
+    <artifactId>plugins</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse.epsilon</groupId>
+  <artifactId>org.eclipse.epsilon.emc.simulink.dt</artifactId>
+  <version>1.5.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/Activator.java b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/Activator.java
new file mode 100644
index 0000000..196942a
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/Activator.java
@@ -0,0 +1,60 @@
+/*******************************************************************************

+ * Copyright (c) 2012 The University of York.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *     Dimitrios Kolovos - initial API and implementation

+ ******************************************************************************/

+package org.eclipse.epsilon.emc.simulink.dt;

+

+import org.eclipse.core.runtime.Plugin;

+import org.osgi.framework.BundleContext;

+

+/**

+ * The activator class controls the plug-in life cycle

+ */

+public class Activator extends Plugin {

+

+	// The plug-in ID

+	public static final String PLUGIN_ID = "org.eclipse.epsilon.emc.plainxml.dt";

+

+	// The shared instance

+	private static Activator plugin;

+	

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+

+}

diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelConfigurationDialog.java b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelConfigurationDialog.java
new file mode 100644
index 0000000..d417472
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelConfigurationDialog.java
@@ -0,0 +1,73 @@
+/*******************************************************************************

+ * Copyright (c) 2012 The University of York.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *     Dimitrios Kolovos - initial API and implementation

+ ******************************************************************************/

+package org.eclipse.epsilon.emc.simulink.dt;

+

+import org.eclipse.epsilon.common.dt.launching.dialogs.AbstractCachedModelConfigurationDialog;

+import org.eclipse.epsilon.emc.simulink.SimulinkModel;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Text;

+

+public class SimulinkModelConfigurationDialog extends AbstractCachedModelConfigurationDialog {

+	

+	protected String getModelName() {

+		return "Simulink Model";

+	}

+

+	

+	protected String getModelType() {

+		return "Simulink";

+	}

+	

+	protected Label fileTextLabel;

+	protected Text fileText;

+	protected Button browseModelFile;

+	

+	

+	protected void createGroups(Composite control) {

+		super.createGroups(control);

+		createFilesGroup(control);

+		createLoadStoreOptionsGroup(control);

+	}

+	

+	protected Composite createFilesGroup(Composite parent) {

+		final Composite groupContent = createGroupContainer(parent, "Files/URIs", 3);

+		

+		fileTextLabel = new Label(groupContent, SWT.NONE);

+		fileTextLabel.setText("File: ");

+		

+		fileText = new Text(groupContent, SWT.BORDER);

+		fileText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

+		

+		browseModelFile = new Button(groupContent, SWT.NONE);

+		browseModelFile.setText("Browse Workspace...");

+		browseModelFile.addListener(SWT.Selection, new BrowseWorkspaceForModelsListener(fileText, "XML Documents in the workspace", "Select an XML document"));

+		

+		groupContent.layout();

+		groupContent.pack();

+		return groupContent;

+	}

+	

+	protected void loadProperties(){

+		super.loadProperties();

+		if (properties == null) return;

+		fileText.setText(properties.getProperty(SimulinkModel.PROPERTY_FILE));

+	}

+	

+	

+	protected void storeProperties(){

+		super.storeProperties();

+		properties.put(SimulinkModel.PROPERTY_FILE, fileText.getText());

+	}

+}

diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelElementLocator.java b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelElementLocator.java
new file mode 100644
index 0000000..2051d93
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelElementLocator.java
@@ -0,0 +1,32 @@
+package org.eclipse.epsilon.emc.simulink.dt;
+
+import org.eclipse.epsilon.common.dt.locators.IModelElementLocator;
+import org.eclipse.epsilon.common.dt.util.LogUtil;
+import org.eclipse.epsilon.emc.simulink.SimulinkBlock;
+import org.eclipse.epsilon.emc.simulink.SimulinkModel;
+import org.eclipse.epsilon.emc.simulink.SimulinkPropertySetter;
+import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
+
+public class SimulinkModelElementLocator implements IModelElementLocator {
+
+	public SimulinkModelElementLocator() {}
+
+	@Override
+	public boolean canLocate(Object o) {
+		return o instanceof SimulinkBlock;
+	}
+
+	@Override
+	public void locate(Object o) {
+		SimulinkBlock element = (SimulinkBlock) o;
+		SimulinkPropertySetter setter = new SimulinkPropertySetter(((SimulinkModel)element.getOwningModel()).getEngine());
+		setter.setProperty("selected");
+		setter.setObject(element);
+		try {
+			setter.invoke("on");
+		} catch (EolRuntimeException e) {
+			LogUtil.log(e);
+		}
+	}
+
+}
diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelInEclipse.java b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelInEclipse.java
new file mode 100644
index 0000000..4057090
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelInEclipse.java
@@ -0,0 +1,13 @@
+package org.eclipse.epsilon.emc.simulink.dt;
+
+import org.eclipse.epsilon.common.dt.EpsilonCommonsPlugin;
+import org.eclipse.epsilon.emc.simulink.SimulinkModel;
+
+public class SimulinkModelInEclipse extends SimulinkModel {
+	
+	public SimulinkModelInEclipse() {
+		this.engineJarPath = EpsilonCommonsPlugin.getDefault().getPreferenceStore().getString(SimulinkModel.PROPERTY_ENGINE_JAR_PATH);
+		this.libraryPath = EpsilonCommonsPlugin.getDefault().getPreferenceStore().getString(SimulinkModel.PROPERTY_LIBRARY_PATH);
+	}
+	
+}
diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelPreferencePage.java b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelPreferencePage.java
new file mode 100644
index 0000000..6b53fd5
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelPreferencePage.java
@@ -0,0 +1,91 @@
+package org.eclipse.epsilon.emc.simulink.dt;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.epsilon.common.dt.EpsilonCommonsPlugin;
+import org.eclipse.epsilon.emc.simulink.MatlabEnginePool;
+import org.eclipse.epsilon.emc.simulink.SimulinkModel;
+import org.eclipse.jface.preference.DirectoryFieldEditor;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.FileFieldEditor;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class SimulinkModelPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+	
+	protected List<FieldEditor> fieldEditors = new ArrayList<FieldEditor>();
+	
+	@Override
+	protected Control createContents(Composite parent) {
+		
+		Composite composite = new Composite(parent, SWT.FILL);
+
+		final DirectoryFieldEditor libraryPathEditor = new DirectoryFieldEditor(SimulinkModel.PROPERTY_LIBRARY_PATH, "Library directory", composite);
+		final FileFieldEditor engineJarPathEditor = new FileFieldEditor(SimulinkModel.PROPERTY_ENGINE_JAR_PATH, "Engine JAR file", true, composite);
+		
+		fieldEditors.add(libraryPathEditor);
+		fieldEditors.add(engineJarPathEditor);
+		
+		for (FieldEditor fieldEditor : fieldEditors) {
+			fieldEditor.setPreferenceStore(EpsilonCommonsPlugin.getDefault().getPreferenceStore());
+			fieldEditor.load();
+		}
+		
+		/*
+		Button testConnectionButton = new Button(composite, SWT.NONE);
+		testConnectionButton.setText("Test connection");
+		testConnectionButton.addSelectionListener(new SelectionListener() {
+			
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				try {
+					MatlabEnginePool.reset();
+					MatlabEnginePool.getInstance(libraryPathEditor.getStringValue(), engineJarPathEditor.getStringValue()).getMatlabEngine().eval("42");
+				}
+				catch (Exception ex) {
+					ex.printStackTrace();
+				}
+			}
+			
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+				
+			}
+		});
+		
+		Button resetConnectionButton = new Button(composite, SWT.NONE);
+		resetConnectionButton.setText("Reset connection");
+		testConnectionButton.addSelectionListener(new SelectionListener() {
+			
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				MatlabEnginePool.reset();
+			}
+			
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+				
+			}
+		});*/
+		return composite;
+	}
+	
+	public void init(IWorkbench workbench) {
+
+	}
+
+	@Override
+	public boolean performOk() {
+		for (FieldEditor fieldEditor : fieldEditors) {
+			fieldEditor.store();
+		}
+		MatlabEnginePool.reset();
+		return true;
+	}
+
+}
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/.classpath b/plugins/org.eclipse.epsilon.emc.simulink/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/.gitignore b/plugins/org.eclipse.epsilon.emc.simulink/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/.project b/plugins/org.eclipse.epsilon.emc.simulink/.project
new file mode 100644
index 0000000..51c4070
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.epsilon.emc.simulink</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.epsilon.emc.simulink/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..c537b63
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/META-INF/MANIFEST.MF b/plugins/org.eclipse.epsilon.emc.simulink/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9127620
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Simulink
+Bundle-SymbolicName: org.eclipse.epsilon.emc.simulink
+Bundle-Version: 1.5.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.epsilon.eol.engine
+Export-Package: org.eclipse.epsilon.emc.simulink
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/build.properties b/plugins/org.eclipse.epsilon.emc.simulink/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/pom.xml b/plugins/org.eclipse.epsilon.emc.simulink/pom.xml
new file mode 100644
index 0000000..01032fb
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.epsilon</groupId>
+    <artifactId>plugins</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse.epsilon</groupId>
+  <artifactId>org.eclipse.epsilon.emc.simulink</artifactId>
+  <version>1.5.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/MatlabEngine.java b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/MatlabEngine.java
new file mode 100644
index 0000000..7c11522
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/MatlabEngine.java
@@ -0,0 +1,81 @@
+package org.eclipse.epsilon.emc.simulink;
+
+import java.lang.reflect.Method;
+
+public class MatlabEngine {
+	
+	protected Object engine;
+	protected Method evalMethod;
+	protected Method getVariableMethod;
+	
+	public MatlabEngine(Class<?> matlabEngineClass) {
+		try {
+			engine = matlabEngineClass.getMethod("connectMatlab").invoke(null);
+			evalMethod = engine.getClass().getMethod("eval", String.class);
+			getVariableMethod = engine.getClass().getMethod("getVariable", String.class);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	public Object evalWithResult(String cmd) throws Exception {
+		eval("result = " + cmd);
+		return getVariable("result");
+	}
+	
+	public Object evalWithSetupAndResult(String setup, String cmd, Object... parameters) {
+		eval(setup + "\n" + "result = " + cmd, parameters);
+		try {
+			return getVariable("result");
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	public Object evalWithResult(String cmd, Object... parameters) {
+		eval("result = " + cmd, parameters);
+		try {
+			return getVariable("result");
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	public void eval(String cmd, Object... parameters) {
+		cmd = " " + cmd + " ";
+		String[] parts = cmd.split("[?]");
+		if (parts.length != parameters.length + 1) 
+			throw new RuntimeException(parts.length - 1 + " parameters were expected but " + parameters.length + " were provided");
+		
+		cmd = parts[0];
+		for (int i=0; i<parameters.length; i++) {
+			cmd += String.valueOf(parameters[i]).replace("'", "''") + parts[i+1];
+		}
+		cmd = cmd.substring(1, cmd.length()-1);
+		try {
+			eval(cmd);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	public void eval(String cmd) {
+		try {
+			evalMethod.invoke(engine, cmd);
+		}
+		catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+	}
+
+	public Object getVariable(String variable) {
+		try {
+			return getVariableMethod.invoke(engine, variable);
+		}
+		catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+	}
+
+	
+}
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/MatlabEnginePool.java b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/MatlabEnginePool.java
new file mode 100644
index 0000000..b37e196
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/MatlabEnginePool.java
@@ -0,0 +1,71 @@
+package org.eclipse.epsilon.emc.simulink;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+public class MatlabEnginePool {
+	
+	protected static MatlabEnginePool instance;
+	protected Set<MatlabEngine> pool = new LinkedHashSet<MatlabEngine>();
+	protected Class<?> matlabEngineClass;
+	protected String libraryPath = "";
+	protected String engineJarPath = "";
+	
+	private MatlabEnginePool(String libraryPath, String engineJarPath) {
+
+		this.libraryPath = libraryPath;
+		this.engineJarPath = engineJarPath;
+		
+		try {
+			System.setProperty("java.library.path", libraryPath);
+			final Field sysPathsField = ClassLoader.class.getDeclaredField("sys_paths");
+		    sysPathsField.setAccessible(true);
+		    sysPathsField.set(null, null);
+
+			URLClassLoader classLoader = URLClassLoader.newInstance(new URL[]{new File(engineJarPath).toURI().toURL()});
+			matlabEngineClass = classLoader.loadClass("com.mathworks.engine.MatlabEngine");
+		}
+		catch (Exception ex) {
+			
+		}
+	}
+	
+	public static MatlabEnginePool getInstance(String libraryPath, String engineJarPath) {
+		if (instance == null || (instance !=null && (!libraryPath.equalsIgnoreCase(instance.getLibraryPath()) || !engineJarPath.equalsIgnoreCase(instance.getEngineJarPath())))) {
+			instance = new MatlabEnginePool(libraryPath, engineJarPath);
+		}
+		return instance;
+	}
+	
+	public static void reset() {
+		instance = null;
+	}
+	
+	public MatlabEngine getMatlabEngine() {
+		if (pool.isEmpty()) {
+			return new MatlabEngine(matlabEngineClass);
+		}
+		else {
+			MatlabEngine engine = pool.iterator().next();
+			pool.remove(engine);
+			return engine;
+		}
+	}
+	
+	public void release(MatlabEngine engine) {
+		pool.add(engine);
+	}
+	
+	public String getEngineJarPath() {
+		return engineJarPath;
+	}
+	
+	public String getLibraryPath() {
+		return libraryPath;
+	}
+	
+}
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkBlock.java b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkBlock.java
new file mode 100644
index 0000000..c9ff551
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkBlock.java
@@ -0,0 +1,160 @@
+package org.eclipse.epsilon.emc.simulink;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.swing.text.html.HTMLDocument.BlockElement;
+
+public class SimulinkBlock extends SimulinkElement {
+	
+	protected String type;
+	
+	public SimulinkBlock(SimulinkModel model, String path, String type, MatlabEngine engine) {
+		this.model = model;
+		try {
+			handle = (Double) engine.evalWithResult("add_block('?', '?', 'MakeNameUnique', 'on')", type, path);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+		this.type = type;
+		this.engine = engine;
+	}
+	
+	public SimulinkBlock(SimulinkModel model, Double handle, String type, MatlabEngine engine) {
+		this.model = model;
+		this.handle = handle;
+		this.type = type;
+		this.engine = engine;
+	}
+	
+	public String getType() {
+		if (type == null) {
+			try {
+				type = (String) engine.evalWithSetupAndResult("handle = ?", "get_param (handle, 'BlockType')", getHandle());
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		}
+		return type;
+	}
+	
+	public void link(SimulinkBlock other) {
+		link(other, 1, 1);
+	}
+	
+	public void linkTo(SimulinkBlock other, int inPort) {
+		link(other, 1, inPort);
+	}
+	
+	public void linkFrom(SimulinkBlock other, int outPort) {
+		link(other, outPort, 1);
+	}
+	
+	public void link(SimulinkBlock other, int outPort, int inPort) {
+		manageLink(other, outPort, inPort, true);
+	}
+	
+	public void unlink(SimulinkBlock other) {
+		unlink(other, 1, 1);
+	}
+	
+	public void unlinkTo(SimulinkBlock other, int inPort) {
+		unlink(other, 1, inPort);
+	}
+	
+	public void unlinkFrom(SimulinkBlock other, int outPort) {
+		unlink(other, outPort, 1);
+	}
+	
+	public void unlink(SimulinkBlock other, int outPort, int inPort) {
+		manageLink(other, outPort, inPort, false);
+	}
+	
+	public void manageLink(SimulinkBlock other, int outPort, int inPort, boolean create) {
+		String command = "sourceHandle = ?\n" +
+						 "targetHandle = ?\n" +
+						 "OutPortHandles = get_param(sourceHandle,'PortHandles')\n" +
+						 "InPortHandles = get_param(targetHandle,'PortHandles')\n" + 
+						 "?_line('?',OutPortHandles.Outport(?),InPortHandles.Inport(?))";
+		try {
+			engine.eval(command, getHandle(), other.getHandle(), create ? "add" : "delete", getParentPath(), outPort, inPort);
+		}
+		catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+	}
+	
+	protected String getParentPath() {
+		SimulinkBlock parent = getParent();
+		return parent == null ? model.getSimulinkModelName() : parent.getPath();
+	}
+	
+	public void setParent(SimulinkBlock parent) {
+		try {
+			String name = (String) getProperty("name");
+			String parentPath = parent == null ? model.getSimulinkModelName() : parent.getPath();
+			Double newHandle = (Double) engine.evalWithResult("add_block('?', '?', 'MakeNameUnique', 'on')", getPath(), parentPath + "/" + name);
+			engine.eval("handle = ? \n delete_block(handle)", handle);
+			handle = newHandle;
+		}
+		catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+	}
+	
+	/**
+	 * Returns null for top-level elements and a 
+	 * SimulinkElement for nested elements
+	 */
+	public SimulinkBlock getParent() {
+		
+		String path = getPath();
+		int lastPathSeparator = path.lastIndexOf("/");
+		
+		if (lastPathSeparator > -1) {
+			String parentPath = path.substring(0, lastPathSeparator);
+			
+			if (parentPath.indexOf("/") < 0) return null;
+			
+			try {
+				Double parentHandle = (Double) engine.evalWithResult("getSimulinkBlockHandle('?')", parentPath);
+				return new SimulinkBlock(model, parentHandle, null, engine);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		}
+		
+		return null;
+	}
+	
+	public String getPath() {
+		try {
+			return (String) engine.evalWithResult("getfullname(" + handle + ")");
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	@Override
+	public String toString() {
+		return getPath();
+	}
+	
+	public List<BlockElement> getNext() {
+		
+		try {
+			// engine.eval("handle = ? \n pc = get_param(handle, 'PortConnectivity') \n dstBlock = pc.SrcBlock", this.handle);
+			engine.eval("handle = ? \n ph = get_param(handle, 'PortHandles') \n "
+					+ "line = get_param(ph.Outport(1), 'Line') \n inspect(line)"
+					+ "lc = get_param(line, 'LineChildren')", this.handle);
+			System.out.println("Line:" + engine.getVariable("line"));
+		}
+		catch (Throwable t) {
+			t.printStackTrace();
+		}
+		
+		return Collections.emptyList();
+		
+	}
+	
+}
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkElement.java b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkElement.java
new file mode 100644
index 0000000..7fc63c9
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkElement.java
@@ -0,0 +1,30 @@
+package org.eclipse.epsilon.emc.simulink;
+
+import org.eclipse.epsilon.eol.models.IModel;
+import org.eclipse.epsilon.eol.models.IModelElement;
+
+public abstract class SimulinkElement implements IModelElement {
+
+	protected SimulinkModel model = null;
+	protected Double handle = null;
+	protected MatlabEngine engine;
+	
+	@Override
+	public IModel getOwningModel() {
+		return model;
+	}
+
+	public Double getHandle() {
+		return handle;
+	}
+	
+	@Override
+	public boolean equals(Object other) {
+		return other instanceof SimulinkElement && ((SimulinkElement) other).getHandle().equals(this.getHandle());
+	}
+	
+	public Object getProperty(String property) {
+		return engine.evalWithSetupAndResult("handle = ?", "get_param (handle, '?')", getHandle(), property);
+	}
+	
+}
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkModel.java b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkModel.java
new file mode 100644
index 0000000..717ed32
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkModel.java
@@ -0,0 +1,295 @@
+package org.eclipse.epsilon.emc.simulink;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.epsilon.common.util.StringProperties;
+import org.eclipse.epsilon.eol.exceptions.EolInternalException;
+import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
+import org.eclipse.epsilon.eol.exceptions.models.EolEnumerationValueNotFoundException;
+import org.eclipse.epsilon.eol.exceptions.models.EolModelElementTypeNotFoundException;
+import org.eclipse.epsilon.eol.exceptions.models.EolModelLoadingException;
+import org.eclipse.epsilon.eol.exceptions.models.EolNotInstantiableModelElementTypeException;
+import org.eclipse.epsilon.eol.execute.introspection.IPropertyGetter;
+import org.eclipse.epsilon.eol.execute.introspection.IPropertySetter;
+import org.eclipse.epsilon.eol.models.CachedModel;
+import org.eclipse.epsilon.eol.models.IRelativePathResolver;
+
+public class SimulinkModel extends CachedModel<SimulinkBlock> {
+	
+	protected File file = null;
+	protected MatlabEngine engine;
+	protected SimulinkPropertyGetter propertyGetter;
+	protected SimulinkPropertySetter propertySetter;
+	protected String libraryPath;
+	protected String engineJarPath;
+	protected double handle = -1;
+	
+	public static String PROPERTY_FILE = "file";
+	public static String PROPERTY_LIBRARY_PATH = "library_path";
+	public static String PROPERTY_ENGINE_JAR_PATH = "engine_jar_path";
+	
+	public static void main(String[] args) throws Exception {
+		SimulinkModel model = new SimulinkModel();
+		model.setName("M");
+		model.setFile(File.createTempFile("foo", ".slx"));
+		model.setReadOnLoad(false);
+		model.setStoredOnDisposal(false);
+		model.setEngineJarPath("/Applications/MATLAB_R2017a.app/extern/engines/java/jar/engine.jar");
+		model.setLibraryPath("/Applications/MATLAB_R2017a.app/bin/maci64");
+		model.load();
+		System.out.println(model.getAllOfType("Gain"));
+	}
+	
+	public void load(StringProperties properties, IRelativePathResolver resolver)
+			throws EolModelLoadingException {
+		
+		super.load(properties, resolver);
+		
+		String filePath = properties.getProperty(SimulinkModel.PROPERTY_FILE);
+		if (properties.hasProperty(SimulinkModel.PROPERTY_LIBRARY_PATH)) libraryPath = properties.getProperty(SimulinkModel.PROPERTY_LIBRARY_PATH);
+		if (properties.hasProperty(SimulinkModel.PROPERTY_ENGINE_JAR_PATH)) engineJarPath = properties.getProperty(SimulinkModel.PROPERTY_ENGINE_JAR_PATH);
+		
+		if (filePath != null && filePath.trim().length() > 0) {
+			file = new File(resolver.resolve(filePath));
+		}
+		
+		load();
+	}
+	
+	@Override
+	protected SimulinkBlock createInstanceInModel(String type)
+			throws EolModelElementTypeNotFoundException, EolNotInstantiableModelElementTypeException {
+		
+		return new SimulinkBlock(this, getSimulinkModelName() + "/" + getSimpleTypeName(type), type, engine);
+	}
+	
+	protected String getSimpleTypeName(String type) {
+		if (type.indexOf("/") > -1) {
+			String[] parts = type.split("/");
+			return parts[parts.length-1];
+		}
+		else {
+			return type;
+		}
+	}
+	
+	@Override
+	protected void loadModel() throws EolModelLoadingException {
+		try {
+			engine = MatlabEnginePool.getInstance(libraryPath, engineJarPath).getMatlabEngine();
+			if (readOnLoad) {
+				// TODO: Add a flag for using the invisible load_system instead
+				engine.eval("open_system " + file.getAbsolutePath());
+			}
+			else {
+				try {
+					engine.eval("new_system('?', 'Model')", getSimulinkModelName());
+				}
+				catch (Exception ex) {
+					// Ignore; system already exists
+				}
+				engine.eval("open_system " + getSimulinkModelName());
+			}
+			
+			this.handle = (Double) engine.evalWithResult("get_param('?', 'Handle')", getSimulinkModelName());
+			
+		} catch (Exception e) {
+			throw new EolModelLoadingException(e, this);
+		};
+	}
+	
+	public File getFile() {
+		return file;
+	}
+	
+	public void setFile(File file) {
+		this.file = file;
+	}
+	
+	@Override
+	public Object getEnumerationValue(String enumeration, String label) throws EolEnumerationValueNotFoundException {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public String getTypeNameOf(Object instance) {
+		return ((SimulinkBlock) instance).getType();
+	}
+
+	@Override
+	public Object getElementById(String id) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getElementId(Object instance) {
+		return ((SimulinkBlock) instance).getHandle() + "";
+	}
+
+	@Override
+	public void setElementId(Object instance, String newId) {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public boolean owns(Object instance) {
+		return instance instanceof SimulinkElement && 
+			((SimulinkElement) instance).getOwningModel() == this;
+	}
+
+	@Override
+	public boolean isInstantiable(String type) {
+		return hasType(type);
+	}
+
+	@Override
+	public boolean hasType(String type) {
+		return true;
+	}
+
+	@Override
+	public boolean store(String location) {
+		try {
+			engine.eval("save_system ('?', '?')", getSimulinkModelName(), location);
+			return true;
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	@Override
+	public boolean store() {
+		store(file.getAbsolutePath());
+		return true;
+	}
+
+	@Override
+	protected Collection<SimulinkBlock> allContentsFromModel() {
+		try {
+			return getElementsForHandles(engine.evalWithResult("find_system(?, 'FindAll', 'on')", this.handle), null);
+		} catch (Exception e) {
+			return Collections.emptyList();
+		}
+	}
+
+	@Override
+	protected Collection<SimulinkBlock> getAllOfTypeFromModel(String type)
+			throws EolModelElementTypeNotFoundException {
+		try {
+			return getElementsForHandles(engine.evalWithResult("find_system('?', 'FindAll', 'on', 'BlockType', '?')", getSimulinkModelName(), type), type);
+		} catch (Exception e) {
+			throw new EolModelElementTypeNotFoundException(this.getName(), type);
+		}
+	}
+
+	@Override
+	protected Collection<SimulinkBlock> getAllOfKindFromModel(String kind)
+			throws EolModelElementTypeNotFoundException {
+		if ("Block".equals(kind)) {
+			return allContentsFromModel();
+		}
+		else return getAllOfTypeFromModel(kind);
+	}
+	
+	protected List<SimulinkBlock> getElementsForHandles(Object handles, String type) {
+		if (handles instanceof Double) {
+			handles = new Double[]{(Double) handles};
+		}
+		
+		List<SimulinkBlock> elements = new ArrayList<SimulinkBlock>();
+		
+		if (handles instanceof Double[]) {
+			for (Double handle : (Double[]) handles) {
+				elements.add(new SimulinkBlock(this, handle, type, engine));
+			}
+		}
+		else if (handles instanceof double[]) {
+			for (double handle : (double[]) handles) {
+				elements.add(new SimulinkBlock(this, handle, type, engine));
+			}
+		}
+		
+		return elements;
+	}
+
+	@Override
+	protected void disposeModel() {
+		MatlabEnginePool.getInstance(libraryPath, engineJarPath).release(engine);
+	}
+
+	@Override
+	protected boolean deleteElementInModel(Object instance) throws EolRuntimeException {
+		try {
+			engine.eval("handle = ? \n delete_block (handle)", ((SimulinkBlock) instance).getHandle());
+			return true;
+		} catch (Exception e) {
+			throw new EolInternalException(e);
+		}
+	}
+
+	@Override
+	protected Object getCacheKeyForType(String type) throws EolModelElementTypeNotFoundException {
+		return type;
+	}
+
+	@Override
+	protected Collection<String> getAllTypeNamesOf(Object instance) {
+		return Arrays.asList("Block", ((SimulinkBlock)instance).getType());
+	}
+	
+	@Override
+	public IPropertySetter getPropertySetter() {
+		if (propertySetter == null) {
+			propertySetter = new SimulinkPropertySetter(engine);
+		}
+		return propertySetter;
+	}
+	
+	@Override
+	public IPropertyGetter getPropertyGetter() {
+		if (propertyGetter == null) {
+			propertyGetter = new SimulinkPropertyGetter();
+		}
+		return propertyGetter;
+	}
+	
+	public MatlabEngine getEngine() {
+		return engine;
+	}
+	
+	public String getSimulinkModelName() {
+		String name = file.getName();
+		int pos = name.lastIndexOf(".");
+		if (pos > 0) { name = name.substring(0, pos); }
+		return name;
+	}
+	
+	public double getHandle() {
+		return handle;
+	}
+
+	public String getLibraryPath() {
+		return libraryPath;
+	}
+
+	public void setLibraryPath(String libraryPath) {
+		this.libraryPath = libraryPath;
+	}
+
+	public String getEngineJarPath() {
+		return engineJarPath;
+	}
+
+	public void setEngineJarPath(String engineJarPath) {
+		this.engineJarPath = engineJarPath;
+	}
+	
+	
+	
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkPort.java b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkPort.java
new file mode 100644
index 0000000..64b5cec
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkPort.java
@@ -0,0 +1,8 @@
+package org.eclipse.epsilon.emc.simulink;
+
+public class SimulinkPort extends SimulinkElement {
+	
+	
+	
+	
+}
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkPropertyGetter.java b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkPropertyGetter.java
new file mode 100644
index 0000000..108a63a
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkPropertyGetter.java
@@ -0,0 +1,29 @@
+package org.eclipse.epsilon.emc.simulink;
+
+import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
+import org.eclipse.epsilon.eol.execute.introspection.java.JavaPropertyGetter;
+
+public class SimulinkPropertyGetter extends JavaPropertyGetter {
+	
+	protected MatlabEngine engine;
+	
+	public SimulinkPropertyGetter() {}
+	
+	@Override
+	public Object invoke(Object object, String property) throws EolRuntimeException {
+		
+		SimulinkElement element = (SimulinkElement) object;
+		
+		if (element instanceof SimulinkBlock && "parent".equalsIgnoreCase(property)) {
+			return ((SimulinkBlock) element).getParent();
+		}
+		
+		try {
+			return element.getProperty(property);
+		}
+		catch (Exception ex) {
+			return super.invoke(object, property);
+		}
+	}
+
+}
diff --git a/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkPropertySetter.java b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkPropertySetter.java
new file mode 100644
index 0000000..2e54a58
--- /dev/null
+++ b/plugins/org.eclipse.epsilon.emc.simulink/src/org/eclipse/epsilon/emc/simulink/SimulinkPropertySetter.java
@@ -0,0 +1,32 @@
+package org.eclipse.epsilon.emc.simulink;
+
+import org.eclipse.epsilon.eol.exceptions.EolInternalException;
+import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
+import org.eclipse.epsilon.eol.execute.introspection.java.JavaPropertySetter;
+
+public class SimulinkPropertySetter extends JavaPropertySetter {
+	
+	protected MatlabEngine engine;
+	
+	public SimulinkPropertySetter(MatlabEngine engine) {
+		this.engine = engine;
+	}
+	
+	@Override
+	public void invoke(Object value) throws EolRuntimeException {
+		
+		SimulinkBlock element = (SimulinkBlock) object;
+		
+		if ("parent".equalsIgnoreCase(property)) {
+			element.setParent((SimulinkBlock) value); return;
+		}
+		
+		try {
+			engine.eval("handle = ? \n set_param (handle, '?', '?')", element.getHandle(), property, value);
+		}
+		catch (Exception ex) {
+			throw new EolInternalException(ex);
+		}
+	}
+	
+}
diff --git a/plugins/org.eclipse.epsilon.updatesite.interim/site.xml b/plugins/org.eclipse.epsilon.updatesite.interim/site.xml
index 72031aa..5b0ecd7 100644
--- a/plugins/org.eclipse.epsilon.updatesite.interim/site.xml
+++ b/plugins/org.eclipse.epsilon.updatesite.interim/site.xml
@@ -31,6 +31,12 @@
    <feature url="features/org.eclipse.epsilon.uml.feature_1.5.0.qualifier.jar" id="org.eclipse.epsilon.uml.feature" version="1.5.0.qualifier">
       <category name="Epsilon UML Integration"/>
    </feature>
+   <feature url="features/org.eclipse.epsilon.simulink.dt.feature_1.5.0.qualifier.jar" id="org.eclipse.epsilon.simulink.dt.feature" version="1.5.0.qualifier">
+      <category name="Epsilon Simulink Integration"/>
+   </feature>
+   <feature url="features/org.eclipse.epsilon.simulink.feature_1.5.0.qualifier.jar" id="org.eclipse.epsilon.simulink.feature" version="1.5.0.qualifier">
+      <category name="Epsilon Simulink Integration"/>
+   </feature>   
    <feature url="features/org.eclipse.epsilon.ewl.gmf.feature_1.5.0.qualifier.jar" id="org.eclipse.epsilon.ewl.gmf.feature" version="1.5.0.qualifier">
       <category name="Epsilon GMF Integration"/>
    </feature>
@@ -84,6 +90,11 @@
          Support for managing EMF-based UML models with languages of the Epsilon platform.
       </description>
    </category-def>
+   <category-def name="Epsilon Simulink Integration" label="Epsilon Simulink Integration">
+      <description>
+         Support for managing Simulink models with languages of the Epsilon platform.
+      </description>
+   </category-def>   
    <category-def name="Epsilon GMF Integration" label="Epsilon GMF Integration">
       <description>
          Support for developing GMF-based editors (Eugenia), and for refactoring models in GMF-based editors using the Epsilon Wizard Language.
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 1f400e2..892fe47 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -70,6 +70,8 @@
     <module>org.eclipse.epsilon.emc.spreadsheets.google.dt</module>
     <module>org.eclipse.epsilon.emc.uml</module>
     <module>org.eclipse.epsilon.emc.uml.dt</module>
+    <module>org.eclipse.epsilon.emc.simulink</module>
+    <module>org.eclipse.epsilon.emc.simulink.dt</module>
     <module>org.eclipse.epsilon.emf.dt</module>
     <module>org.eclipse.epsilon.eml.dt</module>
     <module>org.eclipse.epsilon.eml.engine</module>
diff --git a/standalone/org.eclipse.epsilon.standalone/assembly/kitchensink.xml b/standalone/org.eclipse.epsilon.standalone/assembly/kitchensink.xml
index c79bd4d..4e5b922 100644
--- a/standalone/org.eclipse.epsilon.standalone/assembly/kitchensink.xml
+++ b/standalone/org.eclipse.epsilon.standalone/assembly/kitchensink.xml
@@ -105,6 +105,10 @@
         <outputDirectory></outputDirectory>
       </fileSet>
       <fileSet>
+        <directory>../../plugins/org.eclipse.epsilon.emc.simulink/target/classes</directory>
+        <outputDirectory></outputDirectory>
+      </fileSet>
+      <fileSet>
         <directory>../../plugins/org.eclipse.epsilon.hutn.engine/target/classes</directory>
         <outputDirectory></outputDirectory>
       </fileSet>
diff --git a/standalone/org.eclipse.epsilon.standalone/assembly/simulink-sources.xml b/standalone/org.eclipse.epsilon.standalone/assembly/simulink-sources.xml
new file mode 100644
index 0000000..b5e1789
--- /dev/null
+++ b/standalone/org.eclipse.epsilon.standalone/assembly/simulink-sources.xml
@@ -0,0 +1,15 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+  <id>simulink-sources</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+      <fileSet>
+        <directory>../../plugins/org.eclipse.epsilon.emc.simulink/src</directory>
+        <outputDirectory></outputDirectory>
+      </fileSet>
+  </fileSets>
+</assembly>
diff --git a/standalone/org.eclipse.epsilon.standalone/assembly/simulink-src.xml b/standalone/org.eclipse.epsilon.standalone/assembly/simulink-src.xml
new file mode 100644
index 0000000..19a148a
--- /dev/null
+++ b/standalone/org.eclipse.epsilon.standalone/assembly/simulink-src.xml
@@ -0,0 +1,19 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+  <id>simulink-src</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+      <fileSet>
+        <directory>../../plugins/org.eclipse.epsilon.emc.simulink/target/classes</directory>
+        <outputDirectory></outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../../plugins/org.eclipse.epsilon.emc.simulink/src</directory>
+        <outputDirectory></outputDirectory>
+      </fileSet>
+  </fileSets>
+</assembly>
diff --git a/standalone/org.eclipse.epsilon.standalone/assembly/simulink.pom b/standalone/org.eclipse.epsilon.standalone/assembly/simulink.pom
new file mode 100644
index 0000000..1408537
--- /dev/null
+++ b/standalone/org.eclipse.epsilon.standalone/assembly/simulink.pom
@@ -0,0 +1,46 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.eclipse.epsilon</groupId>
+  <artifactId>epsilon-simulink</artifactId>
+  <version>1.5.0-SNAPSHOT</version>  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.epsilon</groupId>
+      <artifactId>epsilon-core</artifactId>
+      <version>1.5.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <name>Epsilon jar component</name>
+  <description>Epsilon's Simulink muddles driver.</description>
+  <url>http://eclipse.org/epsilon</url>
+  <licenses>
+  	<license>
+  		<name>Eclipse Public License 1.0</name>
+  		<url>https://www.eclipse.org/legal/epl-v10.html</url>
+  		<distribution>repo</distribution>
+  	</license>
+  </licenses>
+  <developers>
+  	<developer>
+  		<id>dkolovos</id>
+  		<name>Dimitrios S. Kolovos</name>
+  	</developer>
+  	<developer>
+  		<id>agarciad</id>
+  		<name>Antonio Garcia-Dominguez</name>
+  	</developer>
+  	<developer>
+  		<id>lrose</id>
+  		<name>Louis Rose</name>
+  	</developer>
+  	<developer>
+  		<id>zschaler</id>
+  		<name>Steffen Zschaler</name>
+  	</developer>
+  </developers>
+  <scm>
+  	<connection>scm:git://git.eclipse.org/gitroot/epsilon/org.eclipse.epsilon.git</connection>
+  	<developerConnection>scm:ssh://git.eclipse.org/gitroot/epsilon/org.eclipse.epsilon.git</developerConnection>
+  	<tag>HEAD</tag>
+  	<url>https://git.eclipse.org/c/epsilon/org.eclipse.epsilon.git/</url>
+  </scm>
+</project>
diff --git a/standalone/org.eclipse.epsilon.standalone/assembly/simulink.xml b/standalone/org.eclipse.epsilon.standalone/assembly/simulink.xml
new file mode 100644
index 0000000..04457b8
--- /dev/null
+++ b/standalone/org.eclipse.epsilon.standalone/assembly/simulink.xml
@@ -0,0 +1,15 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+  <id>simulink</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+      <fileSet>
+        <directory>../../plugins/org.eclipse.epsilon.emc.simulink/target/classes</directory>
+        <outputDirectory></outputDirectory>
+      </fileSet>
+  </fileSets>
+</assembly>
diff --git a/standalone/org.eclipse.epsilon.standalone/jarmodel.xml b/standalone/org.eclipse.epsilon.standalone/jarmodel.xml
index d8d8247..52a3b75 100644
--- a/standalone/org.eclipse.epsilon.standalone/jarmodel.xml
+++ b/standalone/org.eclipse.epsilon.standalone/jarmodel.xml
@@ -85,6 +85,11 @@
 		<project name="org.eclipse.epsilon.emc.graphml"/>
 	</jar>
 
+	<jar name="simulink" requires="core">
+		<description>Epsilon's Simulink muddles driver.</description>
+		<project name="org.eclipse.epsilon.emc.simulink"/>
+	</jar>
+	
 	<jar name="hutn" requires="emf">
 		<description>
 		Epsilon's Human Usable Textual Notation implementation.
diff --git a/standalone/org.eclipse.epsilon.standalone/pom.xml b/standalone/org.eclipse.epsilon.standalone/pom.xml
index 3d8993f..bac2f50 100644
--- a/standalone/org.eclipse.epsilon.standalone/pom.xml
+++ b/standalone/org.eclipse.epsilon.standalone/pom.xml
@@ -68,6 +68,9 @@
 		<descriptor>assembly/graphml.xml</descriptor>
 		<descriptor>assembly/graphml-src.xml</descriptor>
 		<descriptor>assembly/graphml-sources.xml</descriptor>
+		<descriptor>assembly/simulink.xml</descriptor>
+		<descriptor>assembly/simulink-src.xml</descriptor>
+		<descriptor>assembly/simulink-sources.xml</descriptor>		
 		<descriptor>assembly/hutn.xml</descriptor>
 		<descriptor>assembly/hutn-src.xml</descriptor>
 		<descriptor>assembly/hutn-sources.xml</descriptor>
diff --git a/tests/org.eclipse.epsilon.emc.simulink.test/.classpath b/tests/org.eclipse.epsilon.emc.simulink.test/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/tests/org.eclipse.epsilon.emc.simulink.test/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.epsilon.emc.simulink.test/.gitignore b/tests/org.eclipse.epsilon.emc.simulink.test/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/tests/org.eclipse.epsilon.emc.simulink.test/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/tests/org.eclipse.epsilon.emc.simulink.test/.project b/tests/org.eclipse.epsilon.emc.simulink.test/.project
new file mode 100644
index 0000000..5dc5d04
--- /dev/null
+++ b/tests/org.eclipse.epsilon.emc.simulink.test/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.epsilon.emc.simulink.test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/org.eclipse.epsilon.emc.simulink.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.epsilon.emc.simulink.test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..c537b63
--- /dev/null
+++ b/tests/org.eclipse.epsilon.emc.simulink.test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.epsilon.emc.simulink.test/META-INF/MANIFEST.MF b/tests/org.eclipse.epsilon.emc.simulink.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..721abef
--- /dev/null
+++ b/tests/org.eclipse.epsilon.emc.simulink.test/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EMC Simulink Tests
+Bundle-SymbolicName: org.eclipse.epsilon.emc.simulink.test
+Bundle-Version: 1.5.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.junit,
+ org.eclipse.epsilon.eol.engine,
+ org.eclipse.epsilon.emc.simulink
+Export-Package: org.eclipse.epsilon.emc.simulink.test
diff --git a/tests/org.eclipse.epsilon.emc.simulink.test/build.properties b/tests/org.eclipse.epsilon.emc.simulink.test/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/tests/org.eclipse.epsilon.emc.simulink.test/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/tests/org.eclipse.epsilon.emc.simulink.test/src/org/eclipse/epsilon/emc/simulink/test/SimulinkModelTestSuite.java b/tests/org.eclipse.epsilon.emc.simulink.test/src/org/eclipse/epsilon/emc/simulink/test/SimulinkModelTestSuite.java
new file mode 100644
index 0000000..0429351
--- /dev/null
+++ b/tests/org.eclipse.epsilon.emc.simulink.test/src/org/eclipse/epsilon/emc/simulink/test/SimulinkModelTestSuite.java
@@ -0,0 +1,11 @@
+package org.eclipse.epsilon.emc.simulink.test;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({ SimulinkModelTests.class })
+public class SimulinkModelTestSuite {
+	
+}
diff --git a/tests/org.eclipse.epsilon.emc.simulink.test/src/org/eclipse/epsilon/emc/simulink/test/SimulinkModelTests.java b/tests/org.eclipse.epsilon.emc.simulink.test/src/org/eclipse/epsilon/emc/simulink/test/SimulinkModelTests.java
new file mode 100644
index 0000000..6d8a302
--- /dev/null
+++ b/tests/org.eclipse.epsilon.emc.simulink.test/src/org/eclipse/epsilon/emc/simulink/test/SimulinkModelTests.java
@@ -0,0 +1,69 @@
+package org.eclipse.epsilon.emc.simulink.test;
+
+import java.io.File;
+import java.util.UUID;
+
+import org.eclipse.epsilon.emc.simulink.SimulinkModel;
+import org.eclipse.epsilon.eol.EolModule;
+import org.junit.Test;
+
+public class SimulinkModelTests {
+	
+	@Test
+	public void createGain() {
+		run("var gain = new `simulink/Math Operations/Gain`; assert (Gain.all.size() = 1);");
+	}
+	
+	@Test
+	public void setAndGetGainGain() {
+		// gain.gain returns a Character at the moment
+		run("var gain = new `simulink/Math Operations/Gain`; gain.gain = 3; assert('3' = (gain.gain + ''));");
+	}
+	
+	@Test
+	public void setAndGetSubsystemParent() {
+		run("var s1 = new `simulink/Ports & Subsystems/Subsystem`; " +
+			"var s2 = new `simulink/Ports & Subsystems/Subsystem`;" + 
+			"s1.parent = s2; " +
+			"assert(s1.parent = s2);");
+	}
+
+	@Test
+	public void setAndUnsetSubsystemParent() {
+		run("var s1 = new `simulink/Ports & Subsystems/Subsystem`; " +
+			"var s2 = new `simulink/Ports & Subsystems/Subsystem`;" + 
+			"s1.parent = s2; " +
+			"s1.parent = null; " +
+			"assert(s1.parent = null);");
+	}
+	
+	protected void run(String eol) {
+		SimulinkModel model = null;
+		
+		File simulinkEngineJar = new File("/Applications/MATLAB_R2017a.app/extern/engines/java/jar/engine.jar");
+		File simulinkLibraryPath = new File("/Applications/MATLAB_R2017a.app/bin/maci64");
+		if (!simulinkEngineJar.exists() || !simulinkLibraryPath.exists()) return;
+		
+		try {
+			EolModule module = new EolModule();
+			module.parse(eol);
+			model = new SimulinkModel();
+			model.setName("M");
+			model.setFile(new File("model" + String.valueOf(UUID.randomUUID()).replace("-", "") + ".slx"));
+			model.setReadOnLoad(false);
+			model.setStoredOnDisposal(false);
+			model.setLibraryPath(simulinkLibraryPath.getAbsolutePath());
+			model.setEngineJarPath(simulinkEngineJar.getAbsolutePath());
+			model.load();
+			module.getContext().getModelRepository().addModel(model);
+			module.execute();
+		}
+		catch (Exception ex) { 
+			throw new RuntimeException(ex);
+		}
+		finally {
+			 model.dispose();
+		}
+	}
+	
+}
diff --git a/tests/org.eclipse.epsilon.test/META-INF/MANIFEST.MF b/tests/org.eclipse.epsilon.test/META-INF/MANIFEST.MF
index a12fef5..0159a6a 100644
--- a/tests/org.eclipse.epsilon.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.epsilon.test/META-INF/MANIFEST.MF
@@ -46,5 +46,6 @@
  org.eclipse.epsilon.concordance.core.hashing;bundle-version="1.5.0",
  org.eclipse.emf.emfatic.core;bundle-version="0.8.0",
  org.eclipse.gmf.bridge;bundle-version="1.3.1",
- org.eclipse.gmf.bridge.trace;bundle-version="1.3.0"
+ org.eclipse.gmf.bridge.trace;bundle-version="1.3.0",
+ org.eclipse.epsilon.emc.simulink.test
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.epsilon.test/src/org/eclipse/epsilon/test/EpsilonTestSuite.java b/tests/org.eclipse.epsilon.test/src/org/eclipse/epsilon/test/EpsilonTestSuite.java
index ffc447a..4b7c6f8 100644
--- a/tests/org.eclipse.epsilon.test/src/org/eclipse/epsilon/test/EpsilonTestSuite.java
+++ b/tests/org.eclipse.epsilon.test/src/org/eclipse/epsilon/test/EpsilonTestSuite.java
@@ -14,9 +14,6 @@
  */
 package org.eclipse.epsilon.test;
 
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-
 import org.eclipse.epsilon.commons.test.CommonsTestSuite;
 import org.eclipse.epsilon.concordance.test.ConcordanceTestSuite;
 import org.eclipse.epsilon.ecl.engine.test.acceptance.EclAcceptanceTestSuite;
@@ -31,6 +28,7 @@
 import org.eclipse.epsilon.emc.graphml.tests.GraphmlTestSuite;
 import org.eclipse.epsilon.emc.hutn.test.HutnEmcDriverTestSuite;
 import org.eclipse.epsilon.emc.plainxml.test.PlainXmlTestSuite;
+import org.eclipse.epsilon.emc.simulink.test.SimulinkModelTestSuite;
 import org.eclipse.epsilon.emc.spreadsheets.test.SpreadsheetDriverTestSuite;
 import org.eclipse.epsilon.eml.engine.test.acceptance.EmlAcceptanceTestSuite;
 import org.eclipse.epsilon.eol.engine.test.acceptance.EolAcceptanceTestSuite;
@@ -48,6 +46,9 @@
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+
 @RunWith(Suite.class)
 @SuiteClasses({CommonsTestSuite.class,
                EolUnitTestSuite.class, 
@@ -74,7 +75,8 @@
                WorkflowTestSuite.class,
                GraphmlTestSuite.class,
                EmfTestSuite.class,
-               SpreadsheetDriverTestSuite.class})
+               SpreadsheetDriverTestSuite.class,
+               SimulinkModelTestSuite.class})
 public class EpsilonTestSuite{
 
 	public static Test suite() {