diff --git a/Samples/Dynamics365FODemo/.gitignore b/Samples/Dynamics365FODemo/.gitignore
new file mode 100644
index 0000000..c194bb3
--- /dev/null
+++ b/Samples/Dynamics365FODemo/.gitignore
@@ -0,0 +1,15 @@
+**/.vs
+**/obj
+**/bin/*
+**/Resources
+**/XppMetadata
+**/Reports
+**/references
+
+BuildModelResult.log
+BuildModelResult.xml
+BuildModelResult.err.xml
+BuildProjectResult.log
+BuildProjectResult.xml
+BuildProjectResult.err.xml
+CompileLabels.xml
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/DeployablePackage/AXDeployablePackage_20231124_17_06_15.zip b/Samples/Dynamics365FODemo/DeployablePackage/AXDeployablePackage_20231124_17_06_15.zip
new file mode 100644
index 0000000..b3dddb7
Binary files /dev/null and b/Samples/Dynamics365FODemo/DeployablePackage/AXDeployablePackage_20231124_17_06_15.zip differ
diff --git a/Samples/Dynamics365FODemo/Dynamics365FODemo.sln b/Samples/Dynamics365FODemo/Dynamics365FODemo.sln
new file mode 100644
index 0000000..c359b69
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Dynamics365FODemo.sln
@@ -0,0 +1,36 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.34031.81
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerFxDemoLibrary", "PowerFxDemoLibrary\PowerFxDemoLibrary.csproj", "{7BACE988-ECCE-4A1A-AF7F-2A400BBF9601}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7DEDF1AD-DD13-4127-8EEC-12B9E30A7B9D}"
+	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
+	EndProjectSection
+EndProject
+Project("{FC65038C-1B2F-41E1-A629-BED71D161FFF}") = "PowerFxDemo D365FO (VAR) [PowerFx D365FO Demo]", "PowerFxDemo D365FO\PowerFxDemo D365FO.rnrproj", "{3877D19E-04BE-4209-BFB9-979C95B574BC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7BACE988-ECCE-4A1A-AF7F-2A400BBF9601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BACE988-ECCE-4A1A-AF7F-2A400BBF9601}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BACE988-ECCE-4A1A-AF7F-2A400BBF9601}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BACE988-ECCE-4A1A-AF7F-2A400BBF9601}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3877D19E-04BE-4209-BFB9-979C95B574BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3877D19E-04BE-4209-BFB9-979C95B574BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3877D19E-04BE-4209-BFB9-979C95B574BC}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{3877D19E-04BE-4209-BFB9-979C95B574BC}.Release|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {914DB8F6-2C93-420B-9F34-90AF1B21D442}
+	EndGlobalSection
+EndGlobal
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/Descriptor/PowerFxDemo.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/Descriptor/PowerFxDemo.xml
new file mode 100644
index 0000000..6a5e9b2
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/Descriptor/PowerFxDemo.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxModelInfo xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<AppliedUpdates xmlns:d2p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+	<Customization>Allow</Customization>
+	<Description>PowerFx D365FO Demo</Description>
+	<DisplayName>PowerFx D365FO Demo</DisplayName>
+	<Id>896000516</Id>
+	<InternalsVisibleTo xmlns:d2p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+	<Layer>10</Layer>
+	<Locked>false</Locked>
+	<ModelModule>PowerFxDemo</ModelModule>
+	<ModelReferences xmlns:d2p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays"
+		i:nil="true" />
+	<ModuleReferences xmlns:d2p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
+		<d2p1:string>ApplicationFoundation</d2p1:string>
+		<d2p1:string>ApplicationPlatform</d2p1:string>
+		<d2p1:string>ApplicationSuite</d2p1:string>
+		<d2p1:string>ContactPerson</d2p1:string>
+		<d2p1:string>Directory</d2p1:string>
+		<d2p1:string>FiscalBooks</d2p1:string>
+		<d2p1:string>Ledger</d2p1:string>
+		<d2p1:string>Retail</d2p1:string>
+		<d2p1:string>SourceDocumentation</d2p1:string>
+		<d2p1:string>SourceDocumentationTypes</d2p1:string>
+		<d2p1:string>Tax</d2p1:string>
+	</ModuleReferences>
+	<Name>PowerFxDemo</Name>
+	<Publisher>Dominik Downarowicz</Publisher>
+	<SolutionId>00000000-0000-0000-0000-000000000000</SolutionId>
+	<VersionBuild>0</VersionBuild>
+	<VersionMajor>1</VersionMajor>
+	<VersionMinor>0</VersionMinor>
+	<VersionRevision>0</VersionRevision>
+</AxModelInfo>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo.xref b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo.xref
new file mode 100644
index 0000000..6bcec00
Binary files /dev/null and b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo.xref differ
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxDeliveryAddressContract.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxDeliveryAddressContract.xml
new file mode 100644
index 0000000..8849e22
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxDeliveryAddressContract.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxClass xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>PowerFxDeliveryAddressContract</Name>
+	<SourceCode>
+		<Declaration><![CDATA[
+[DataContractAttribute]
+class PowerFxDeliveryAddressContract
+{
+    str name;
+    str street;
+    str city;
+    str zipCode;
+    str countryCode;
+
+}
+]]></Declaration>
+		<Methods>
+			<Method>
+				<Name>parmName</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('AddressName')]
+    public str parmName(str _AddressName = name)
+    {
+        name = _AddressName;
+        return name;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmStreet</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('Street')]
+    public str parmStreet(str _Street = street)
+    {
+        street = _Street;
+        return street;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmCity</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('City')]
+    public str parmCity(str _City = city)
+    {
+        city = _City;
+        return city;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmZipCode</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('PostCode')]
+    public str parmZipCode(str _ZipCode = zipCode)
+    {
+        zipCode = _ZipCode;
+        return zipCode;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmCountryCode</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('ISOCountry')]
+    public str parmCountryCode(str _CountryCode = countryCode)
+    {
+        countryCode = _CountryCode;
+        return countryCode;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>getInstance</Name>
+				<Source><![CDATA[
+    public static PowerFxDeliveryAddressContract getInstance(LogisticsPostalAddress _postalAddress)
+    {
+        PowerFxDeliveryAddressContract deliveryAddress = new PowerFxDeliveryAddressContract();
+        deliveryAddress.parmName(_postalAddress.Address);
+        deliveryAddress.parmStreet(_postalAddress.Street);
+        deliveryAddress.parmCity(_postalAddress.City);
+        deliveryAddress.parmZipCode(_postalAddress.ZipCode);
+        deliveryAddress.parmCountryCode(_postalAddress.CountryRegionId);
+        return deliveryAddress;
+    }
+
+]]></Source>
+			</Method>
+		</Methods>
+	</SourceCode>
+</AxClass>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxDemoRunnable.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxDemoRunnable.xml
new file mode 100644
index 0000000..5b37e3e
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxDemoRunnable.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxClass xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>PowerFxDemoRunnable</Name>
+	<SourceCode>
+		<Declaration><![CDATA[
+using PowerFxDemoLibrary;
+
+internal final class PowerFxDemoRunnable
+{
+    Dialog dialog;
+    DialogField contextField, formulaField, evaluationField, errorField, salesOrderLookup;
+
+    Evaluation evaluator = new Evaluation();
+}
+]]></Declaration>
+		<Methods>
+			<Method>
+				<Name>main</Name>
+				<Source><![CDATA[
+    public static void main(Args _args)
+    {
+        new PowerFxDemoRunnable().run();
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>run</Name>
+				<Source><![CDATA[
+    public void run()
+    {
+        dialog = new Dialog("PowerFX Test");
+        dialog.form().design().dialogSize(DialogSize::Large);
+        dialog.addText("Test the new PowerFx engine");
+
+        salesOrderLookup = dialog.addField(extendedTypeStr(SalesId), "Select sales order context");
+
+        contextField = dialog.addField(extendedTypeStr(WebText), "Context");
+        contextField.multiLine(true);
+        contextField.enabled(false);
+
+        formulaField = dialog.addField(extendedTypeStr(WebText), "Formula");
+        formulaField.multiLine(true);
+        evaluationField = dialog.addField(extendedTypeStr(WebText), "Evaluation Result");
+        evaluationField.multiLine(true);
+        errorField = dialog.addField(extendedTypeStr(WebText), "Error");
+        errorField.multiLine(true);
+        errorField.enabled(false);
+
+        formulaField.registerOverrideMethod(methodStr(FormStringControl, modified), methodStr(PowerFxDemoRunnable, modifiedFormula), this);
+        salesOrderLookup.registerOverrideMethod(methodStr(FormStringControl, modified), methodStr(PowerFxDemoRunnable, modifiedSalesOrderSelection), this);
+        
+        dialog.run();
+        if(dialog.closedOk())
+        {
+            Info(evaluationField.value());
+        }
+        
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>modifiedSalesOrderSelection</Name>
+				<Source><![CDATA[
+    public boolean modifiedSalesOrderSelection(FormStringControl _control)
+    {
+        if(salesOrderLookup.value()){
+            PowerFxSalesHeaderContract contract = PowerFxSalesHeaderContract::getInstance(SalesTable::find(salesOrderLookup.value()));
+            contextField.value(FormJsonSerializer::serializeClass(contract));
+        }
+        return true;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>modifiedFormula</Name>
+				<Source><![CDATA[
+    public boolean modifiedFormula(FormStringControl _control)
+    {
+        Evaluation.Response response = evaluator.EvaluateInput(contextField.value(), formulaField.value());
+
+        if(response.errorThrown == true){
+            //Split string
+            List errorList = new List(Types::String);
+            errorList=strSplit(response.error,'\n');
+            ListIterator iterator = new ListIterator(errorList);
+            while(iterator.more())
+            {
+                if(iterator.value() != "")
+                {
+                    Global::error(iterator.value());
+                }
+                iterator.next();
+            }
+        }
+        evaluationField.value(response.output);
+        errorField.value(response.error);
+        return true;
+    }
+
+]]></Source>
+			</Method>
+		</Methods>
+	</SourceCode>
+</AxClass>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxSalesHeaderContract.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxSalesHeaderContract.xml
new file mode 100644
index 0000000..4d31575
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxSalesHeaderContract.xml
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxClass xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>PowerFxSalesHeaderContract</Name>
+	<SourceCode>
+		<Declaration><![CDATA[
+[DataContractAttribute]
+class PowerFxSalesHeaderContract
+{
+    str salesNumber;
+    str custName;
+    str custAccount;
+    str deliveryDate;
+    str custGroup;
+    str dlvMode;
+    str markupGroup;
+    str paymMode;
+    str salesGroup;
+    str salesType;
+    str vatNum;
+    PowerFxDeliveryAddressContract deliveryAddress;
+    real amountInvoiced;
+    real amountOrderedNotInvoiced;
+    real amountRemainSalesFinancial;
+    real amountRemainSalesPhysical;
+    real contributionMargin;
+    List salesOrderLines;
+
+}
+]]></Declaration>
+		<Methods>
+			<Method>
+				<Name>parmSalesNumber</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('SalesNumber')]
+    public str parmSalesNumber(str _SalesNumber = salesNumber)
+    {
+        salesNumber = _SalesNumber;
+        return salesNumber;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmCustName</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('Name')]
+    public str parmCustName(str _CustName = custName)
+    {
+        custName = _CustName;
+        return custName;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmCustAccount</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('Account')]
+    public str parmCustAccount(str _CustAccount = custAccount)
+    {
+        custAccount = _CustAccount;
+        return custAccount;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmCustGroup</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('CustGroup')]
+    public str parmCustGroup(str _CustGroup = custGroup)
+    {
+        custGroup = _CustGroup;
+        return custGroup;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmVATNum</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('VATNum')]
+    public str parmVATNum(str _VATNum = vatNum)
+    {
+        vatNum = _VATNum;
+        return vatNum;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmMarkupGroup</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('MarkupGroup')]
+    public str parmMarkupGroup(str _MarkupGroup = markupGroup)
+    {
+        markupGroup = _MarkupGroup;
+        return markupGroup;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmDlvMode</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('DlvMode')]
+    public str parmDlvMode(str _DlvMode = dlvMode)
+    {
+        dlvMode = _DlvMode;
+        return dlvMode;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmPaymMode</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('PaymMode')]
+    public str parmPaymMode(str _PaymMode = paymMode)
+    {
+        paymMode = _PaymMode;
+        return paymMode;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmSalesGroup</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('SalesGroup')]
+    public str parmSalesGroup(str _SalesGroup = salesGroup)
+    {
+        salesGroup = _SalesGroup;
+        return salesGroup;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmSalesType</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('SalesGroup')]
+    public str parmSalesType(str _SalesType = salesType)
+    {
+        salesType = _SalesType;
+        return salesType;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmDeliveryDate</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('DeliveryDate')]
+    public str parmDeliveryDate(str _DeliveryDate = deliveryDate)
+    {
+        deliveryDate = _DeliveryDate;
+        return deliveryDate;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmAmountInvoiced</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('AmountInvoiced')]
+    public real parmAmountInvoiced(real _AmountInvoiced = amountInvoiced)
+    {
+        amountInvoiced = _AmountInvoiced;
+        return amountInvoiced;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmAmountOrderedNotInvoiced</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('AmountOrderedNotInvoiced')]
+    public real parmAmountOrderedNotInvoiced(real _AmountOrderedNotInvoiced = amountOrderedNotInvoiced)
+    {
+        amountOrderedNotInvoiced = _AmountOrderedNotInvoiced;
+        return amountOrderedNotInvoiced;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmAmountRemainSalesFinancial</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('AmountRemainSalesFinancial')]
+    public real parmAmountRemainSalesFinancial(real _AmountRemainSalesFinancial = amountRemainSalesFinancial)
+    {
+        amountRemainSalesFinancial = _AmountRemainSalesFinancial;
+        return amountRemainSalesFinancial;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmAmountRemainSalesPhyscial</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('AmountRemainSalesPhyscial')]
+    public real parmAmountRemainSalesPhyscial(real _AmountRemainSalesPhyscial = amountRemainSalesPhysical)
+    {
+        amountRemainSalesPhysical = _AmountRemainSalesPhyscial;
+        return amountRemainSalesPhysical;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmContributionMargin</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('ContributionMargin')]
+    public real parmContributionMargin(real _ContributionMargin = contributionMargin)
+    {
+        contributionMargin = _ContributionMargin;
+        return contributionMargin;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmDeliveryAddress</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('DeliveryAddress')]
+    public PowerFxDeliveryAddressContract parmDeliveryAddress(PowerFxDeliveryAddressContract _deliveryAddress = deliveryAddress)
+    {
+        deliveryAddress = _deliveryAddress;
+        return deliveryAddress;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmSalesOrderLines</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('Lines'), DataCollectionAttribute(Types::Class, classStr(PowerFxSalesLineContract))]
+    public List parmSalesOrderLines(List _salesOrderLines = salesOrderLines)
+    {
+        salesOrderLines = _salesOrderLines;
+        return salesOrderLines;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>getInstance</Name>
+				<Source><![CDATA[
+    public static PowerFxSalesHeaderContract getInstance(SalesTable _salesTable)
+    {
+        PowerFxSalesHeaderContract contract = new PowerFxSalesHeaderContract();
+
+        contract.parmSalesNumber(_salesTable.SalesId);
+        contract.parmCustName(_salesTable.SalesName);
+        contract.parmCustAccount(_salesTable.CustAccount);
+        contract.parmDeliveryDate(date2Str(_salesTable.DeliveryDate, 321, DateDay::Digits2, DateSeparator::Hyphen, DateMonth::Digits2, DateSeparator::Hyphen, DateYear::Digits4));
+        contract.parmCustGroup(_salesTable.CustGroup);
+        contract.parmDlvMode(_salesTable.DlvMode);
+        contract.parmMarkupGroup(_salesTable.MarkupGroup);
+        contract.parmSalesGroup(_salesTable.SalesGroup);
+        contract.parmSalesType(enum2Symbol(enumNum(SalesType), _salesTable.SalesType));
+        contract.parmAmountInvoiced(_salesTable.amountInvoiced());
+        contract.parmAmountOrderedNotInvoiced(_salesTable.amountOrderedNotInvoiced());
+        contract.parmAmountRemainSalesFinancial(_salesTable.amountRemainSalesFinancial());
+        contract.parmAmountRemainSalesPhyscial(_salesTable.amountRemainSalesPhysical());
+        contract.parmContributionMargin(_salesTable.contributionMargin());
+        contract.parmVATNum(_salesTable.VATNum);
+
+        //Delivery Address
+        contract.parmDeliveryAddress(PowerFxDeliveryAddressContract::getInstance(_salesTable.deliveryAddress()));
+
+        List lineList = new List(Types::Class);
+        SalesLine salesLine;
+        while select salesLine where salesLine.SalesId == _salesTable.SalesId {
+            lineList.addEnd(PowerFxSalesLineContract::getInstance(salesLine));
+        }
+
+        contract.parmSalesOrderLines(lineList);
+
+        return contract;
+    }
+
+]]></Source>
+			</Method>
+		</Methods>
+	</SourceCode>
+</AxClass>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxSalesLineContract.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxSalesLineContract.xml
new file mode 100644
index 0000000..a4d2342
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxClass/PowerFxSalesLineContract.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxClass xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>PowerFxSalesLineContract</Name>
+	<SourceCode>
+		<Declaration><![CDATA[
+[DataContractAttribute]
+class PowerFxSalesLineContract
+{
+    str itemName;
+    str itemId;
+    real lineNum;
+    real lineAmount;
+    real salesPrice;
+    real discPercent;
+    real qtyOrdered;
+    real salesQty;
+    str unitId;
+    str currencyCode;
+    str deliveryDate;
+
+
+}
+]]></Declaration>
+		<Methods>
+			<Method>
+				<Name>parmItemName</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('ItemName')]
+    public str parmItemName(str _ItemName = itemName)
+    {
+        itemName = _ItemName;
+        return itemName;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmItemId</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('ItemId')]
+    public str parmItemId(str _ItemId = itemId)
+    {
+        itemId = _ItemId;
+        return itemId;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmLineNum</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('LineId')]
+    public real parmLineNum(real _LineNum = lineNum)
+    {
+        lineNum = _LineNum;
+        return lineNum;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmLineAmount</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('LineAmount')]
+    public real parmLineAmount(real _LineAmount = lineAmount)
+    {
+        lineAmount = _LineAmount;
+        return lineAmount;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmSalesPrice</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('SalesPrice')]
+    public real parmSalesPrice(real _SalesPrice = salesPrice)
+    {
+        salesPrice = _SalesPrice;
+        return salesPrice;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmDiscPercent</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('DiscPercent')]
+    public real parmDiscPercent(real _DiscPercent = discPercent)
+    {
+        discPercent = _DiscPercent;
+        return discPercent;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmQtyOrdered</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('QtyOrdered')]
+    public real parmQtyOrdered(real _Qty = qtyOrdered)
+    {
+        qtyOrdered = _Qty;
+        return qtyOrdered;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmSalesQty</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('SalesQty')]
+    public real parmSalesQty(real _Qty = salesQty)
+    {
+        salesQty = _Qty;
+        return salesQty;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmUnitId</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('UnitId')]
+    public str parmUnitId(str _UnitId = unitId)
+    {
+        unitId = _UnitId;
+        return unitId;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmCurrencyCode</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('CurrencyISO')]
+    public str parmCurrencyCode(str _CurrencyCode = currencyCode)
+    {
+        currencyCode = _CurrencyCode;
+        return currencyCode;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>parmDeliveryDate</Name>
+				<Source><![CDATA[
+    [DataMemberAttribute('DeliveryDate')]
+    public str parmDeliveryDate(str _DeliveryDate = deliveryDate)
+    {
+        deliveryDate = _DeliveryDate;
+        return deliveryDate;
+    }
+
+]]></Source>
+			</Method>
+			<Method>
+				<Name>getInstance</Name>
+				<Source><![CDATA[
+    public static PowerFxSalesLineContract getInstance(SalesLine _salesLine)
+    {
+        PowerFxSalesLineContract contract = new PowerFxSalesLineContract();
+
+        contract.parmItemName(_salesLine.itemName());
+        contract.parmItemId(_salesLine.ItemId);
+        contract.parmLineNum(_salesLine.LineNum);
+        contract.parmLineAmount(_salesLine.LineAmount);
+        contract.parmSalesPrice(_salesLine.SalesPrice);
+        contract.parmQtyOrdered(_salesLine.QtyOrdered);
+        contract.parmSalesQty(_salesLine.SalesQty);
+        contract.parmDiscPercent(_salesLine.discPercent());
+        contract.parmUnitId(_salesLine.SalesUnit);
+        contract.parmCurrencyCode(_salesLine.CurrencyCode);
+        contract.parmDeliveryDate(date2Str(_salesLine.deliveryDate(), 321, DateDay::Digits2, DateSeparator::Hyphen, DateMonth::Digits2, DateSeparator::Hyphen, DateYear::Digits4));
+
+        return contract;
+    }
+
+]]></Source>
+			</Method>
+		</Methods>
+	</SourceCode>
+</AxClass>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Core.resources.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Core.resources.xml
new file mode 100644
index 0000000..9062e53
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Core.resources.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxReference xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>Microsoft.PowerFx.Core.resources</Name>
+	<AssemblyName>Microsoft.PowerFx.Core.resources</AssemblyName>
+	<AssemblyDisplayName>Microsoft.PowerFx.Core.resources, Version=1.1.0.0, Culture=en-US, PublicKeyToken=31bf3856ad364e35</AssemblyDisplayName>
+	<PublicKeyToken>31bf3856ad364e35</PublicKeyToken>
+	<Version>1.1.0.0</Version>
+</AxReference>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Core.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Core.xml
new file mode 100644
index 0000000..bb7e872
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Core.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxReference xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>Microsoft.PowerFx.Core</Name>
+	<AssemblyName>Microsoft.PowerFx.Core</AssemblyName>
+	<AssemblyDisplayName>Microsoft.PowerFx.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</AssemblyDisplayName>
+	<PublicKeyToken>31bf3856ad364e35</PublicKeyToken>
+	<Version>1.1.0.0</Version>
+</AxReference>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Interpreter.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Interpreter.xml
new file mode 100644
index 0000000..c35a40f
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Interpreter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxReference xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>Microsoft.PowerFx.Interpreter</Name>
+	<AssemblyName>Microsoft.PowerFx.Interpreter</AssemblyName>
+	<AssemblyDisplayName>Microsoft.PowerFx.Interpreter, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</AssemblyDisplayName>
+	<PublicKeyToken>31bf3856ad364e35</PublicKeyToken>
+	<Version>1.1.0.0</Version>
+</AxReference>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Json.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Json.xml
new file mode 100644
index 0000000..86c3a83
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Json.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxReference xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>Microsoft.PowerFx.Json</Name>
+	<AssemblyName>Microsoft.PowerFx.Json</AssemblyName>
+	<AssemblyDisplayName>Microsoft.PowerFx.Json, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</AssemblyDisplayName>
+	<PublicKeyToken>31bf3856ad364e35</PublicKeyToken>
+	<Version>1.1.0.0</Version>
+</AxReference>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Repl.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Repl.xml
new file mode 100644
index 0000000..13649fc
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Repl.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxReference xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>Microsoft.PowerFx.Repl</Name>
+	<AssemblyName>Microsoft.PowerFx.Repl</AssemblyName>
+	<AssemblyDisplayName>Microsoft.PowerFx.Repl, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</AssemblyDisplayName>
+	<PublicKeyToken>31bf3856ad364e35</PublicKeyToken>
+	<Version>1.1.0.0</Version>
+</AxReference>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Transport.Attributes.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Transport.Attributes.xml
new file mode 100644
index 0000000..04026bf
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/Microsoft.PowerFx.Transport.Attributes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxReference xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>Microsoft.PowerFx.Transport.Attributes</Name>
+	<AssemblyName>Microsoft.PowerFx.Transport.Attributes</AssemblyName>
+	<AssemblyDisplayName>Microsoft.PowerFx.Transport.Attributes, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35</AssemblyDisplayName>
+	<PublicKeyToken>31bf3856ad364e35</PublicKeyToken>
+	<Version>1.1.0.0</Version>
+</AxReference>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/PowerFxDemoLibrary.xml b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/PowerFxDemoLibrary.xml
new file mode 100644
index 0000000..da83ddd
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/PowerFxDemo/PowerFxDemo/AxReference/PowerFxDemoLibrary.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AxReference xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+	<Name>PowerFxDemoLibrary</Name>
+	<AssemblyName>PowerFxDemoLibrary</AssemblyName>
+	<AssemblyDisplayName>PowerFxDemoLibrary, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</AssemblyDisplayName>
+	<Version>1.0.0.0</Version>
+</AxReference>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/Metadata/Readme.txt.txt b/Samples/Dynamics365FODemo/Metadata/Readme.txt.txt
new file mode 100644
index 0000000..cf22995
--- /dev/null
+++ b/Samples/Dynamics365FODemo/Metadata/Readme.txt.txt
@@ -0,0 +1,29 @@
+Add all AX modules under the Metadata folder.
+
+Example tree structure:
+$/Project/Trunk/Main/Metadata
++---MyMainModule
+|   +---Descriptor
+|   |       MyFirstModel.xml
+|   |       MyOtherModel.xml
+|   |
+|   +---MyFirstModel
+|   |   +---AxClass
+|   |   |       MyClass.xml
+|   |   |
+|   |   \---AxTable
+|   |           MyMainTable.xml
+|   |
+|   \---MyOtherModel
+|       \---AxForm
+|               MyOtherForm.xml
+|
+\---MyOtherModule
+    +---Descriptor
+    |       MyTestModel.xml
+    |
+    \---MyTestModel
+        \---AxClass
+                MyTestClass.xml
+
+Please see https://ax.help.dynamics.com for more details.
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/PowerFxDemo D365FO/PowerFxDemo D365FO.rnrproj b/Samples/Dynamics365FODemo/PowerFxDemo D365FO/PowerFxDemo D365FO.rnrproj
new file mode 100644
index 0000000..5287629
--- /dev/null
+++ b/Samples/Dynamics365FODemo/PowerFxDemo D365FO/PowerFxDemo D365FO.rnrproj	
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <BuildTasksDirectory Condition=" '$(BuildTasksDirectory)' == ''">$(MSBuildProgramFiles32)\MSBuild\Microsoft\Dynamics\AX</BuildTasksDirectory>
+    <Model>PowerFxDemo</Model>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <OutputPath>bin</OutputPath>
+    <SchemaVersion>2.0</SchemaVersion>
+    <GenerateCrossReferences>True</GenerateCrossReferences>
+    <RunAppCheckerRules>False</RunAppCheckerRules>
+    <LogAppcheckerDiagsAsErrors>False</LogAppcheckerDiagsAsErrors>
+    <DeployOnline>False</DeployOnline>
+    <ProjectGuid>{3877d19e-04be-4209-bfb9-979c95b574bc}</ProjectGuid>
+    <Name>PowerFxDemo D365FO</Name>
+    <RootNamespace>PowerFxDemo D365FO</RootNamespace>
+    <StartupType>Class</StartupType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <Configuration>Debug</Configuration>
+    <DBSyncInBuild>False</DBSyncInBuild>
+    <GenerateFormAdaptors>False</GenerateFormAdaptors>
+    <Company>
+    </Company>
+    <Partition>initial</Partition>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DataEntityExpandParentChildRelations>False</DataEntityExpandParentChildRelations>
+    <DataEntityUseLabelTextAsFieldName>False</DataEntityUseLabelTextAsFieldName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="AxClass\PowerFxDeliveryAddressContract">
+      <SubType>Content</SubType>
+      <Name>PowerFxDeliveryAddressContract</Name>
+      <Link>PowerFxDeliveryAddressContract</Link>
+    </Content>
+    <Content Include="AxClass\PowerFxDemoRunnable">
+      <SubType>Content</SubType>
+      <Name>PowerFxDemoRunnable</Name>
+      <Link>PowerFxDemoRunnable</Link>
+    </Content>
+    <Content Include="AxClass\PowerFxSalesHeaderContract">
+      <SubType>Content</SubType>
+      <Name>PowerFxSalesHeaderContract</Name>
+      <Link>PowerFxSalesHeaderContract</Link>
+    </Content>
+    <Content Include="AxClass\PowerFxSalesLineContract">
+      <SubType>Content</SubType>
+      <Name>PowerFxSalesLineContract</Name>
+      <Link>PowerFxSalesLineContract</Link>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.PowerFx.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <Name>Microsoft.PowerFx.Core</Name>
+      <HintPath>C:\Git\power-fx-host-samples\Samples\Dynamics365FODemo\references\Microsoft.PowerFx.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.PowerFx.Core.resources, Version=1.1.0.0, Culture=en-US, PublicKeyToken=31bf3856ad364e35">
+      <Name>Microsoft.PowerFx.Core.resources</Name>
+      <HintPath>C:\Git\power-fx-host-samples\Samples\Dynamics365FODemo\references\Microsoft.PowerFx.Core.resources.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.PowerFx.Interpreter, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <Name>Microsoft.PowerFx.Interpreter</Name>
+      <HintPath>C:\Git\power-fx-host-samples\Samples\Dynamics365FODemo\references\Microsoft.PowerFx.Interpreter.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.PowerFx.Json, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <Name>Microsoft.PowerFx.Json</Name>
+      <HintPath>C:\Git\power-fx-host-samples\Samples\Dynamics365FODemo\references\Microsoft.PowerFx.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.PowerFx.Repl, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <Name>Microsoft.PowerFx.Repl</Name>
+      <HintPath>C:\Git\power-fx-host-samples\Samples\Dynamics365FODemo\references\Microsoft.PowerFx.Repl.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.PowerFx.Transport.Attributes, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <Name>Microsoft.PowerFx.Transport.Attributes</Name>
+      <HintPath>C:\Git\power-fx-host-samples\Samples\Dynamics365FODemo\references\Microsoft.PowerFx.Transport.Attributes.dll</HintPath>
+    </Reference>
+    <Reference Include="PowerFxDemoLibrary, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <Name>PowerFxDemoLibrary</Name>
+      <HintPath>C:\Git\power-fx-host-samples\Samples\Dynamics365FODemo\references\PowerFxDemoLibrary.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.Common.targets" />
+  <Import Project="$(BuildTasksDirectory)\Microsoft.Dynamics.Framework.Tools.BuildTasks.targets" />
+</Project>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/PowerFxDemoLibrary/Evaluation.cs b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/Evaluation.cs
new file mode 100644
index 0000000..8dd0330
--- /dev/null
+++ b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/Evaluation.cs
@@ -0,0 +1,119 @@
+using Microsoft.PowerFx;
+using Microsoft.PowerFx.Syntax;
+using Microsoft.PowerFx.Types;
+using System;
+using System.Collections.Generic;
+
+namespace PowerFxDemoLibrary
+{
+    public class Evaluation
+    {
+        public class Response
+        {
+            public string output { get; set; }
+            public string error { get; set; }
+            public bool   errorThrown { get; set; }
+        }
+
+        private class ThrowErrorFunction : ReflectionFunction
+        {
+            private string errorMessage = "";
+
+            public ThrowErrorFunction(): base("ThrowError", FormulaType.Blank, new[] { FormulaType.String }) { }
+
+            public BlankValue Execute(StringValue x)
+            {
+                addError(x.Value);
+                return FormulaValue.NewBlank();
+            }
+
+            public void addError(string error)
+            {
+                if (error != "")
+                {
+                    errorMessage += errorMessage + "\n" + error;
+                }
+                else
+                {
+                    errorMessage += errorMessage + "\n";
+                }
+            }
+
+            public string getErrorMessage()
+            {
+                return errorMessage.TrimStart('\n').TrimEnd('\n');
+            }
+
+            public bool isFailed()
+            {
+                return errorMessage != "" ? true : false;
+            }
+
+        }
+
+        private class ThrowErrorFunctionEmtpy : ReflectionFunction
+        {
+            public ThrowErrorFunction function;
+            public ThrowErrorFunctionEmtpy(ThrowErrorFunction _function) : base("ThrowError", FormulaType.Blank) 
+            {
+                function = _function;
+            }
+
+            public BlankValue Execute()
+            {
+                function.addError("");
+                return FormulaValue.NewBlank();
+            }
+        }
+
+        public Response EvaluateInput(string context, string expression)
+        {
+            Response response = new Response();
+            IReadOnlyList<Token> tokens = null;
+            CheckResult check = null;
+
+            ThrowErrorFunction errorFunction = new ThrowErrorFunction();
+            ThrowErrorFunctionEmtpy errorFunctionEmpty = new ThrowErrorFunctionEmtpy(errorFunction);
+
+            response.output = "";
+            response.error = "";
+            response.errorThrown = false;
+            try
+            {
+                var config = new PowerFxConfig();
+                config.AddFunction(errorFunction);
+                config.AddFunction(errorFunctionEmpty);
+                var engine = new RecalcEngine(config);
+
+                var parameters = (RecordValue)FormulaValueJSON.FromJson(context);
+
+                if (parameters == null)
+                {
+                    parameters = RecordValue.Empty();
+                }
+
+                tokens = engine.Tokenize(expression);
+                check = engine.Check(expression, parameters.Type, options: null);
+                check.ThrowOnErrors();
+                var eval = check.GetEvaluator();
+                var result = eval.Eval(parameters);
+
+                response.output = HelperClass.TestToString(result);
+            }
+            catch(Exception ex)
+            {
+                errorFunction.addError(ex.Message);
+            }
+            finally
+            {
+                response.errorThrown = errorFunction.isFailed();
+                response.error = errorFunction.getErrorMessage();
+            }
+
+            return response;
+
+        }
+
+    }
+
+}
diff --git a/Samples/Dynamics365FODemo/PowerFxDemoLibrary/HelperClass.cs b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/HelperClass.cs
new file mode 100644
index 0000000..5b8ff1d
--- /dev/null
+++ b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/HelperClass.cs
@@ -0,0 +1,149 @@
+using Microsoft.PowerFx.Types;
+using System;
+using System.Linq;
+using System.Text;
+
+namespace PowerFxDemoLibrary
+{
+    // Helper to print results. 
+    // This should get shared with Repl or from framework.
+    public class HelperClass
+    {
+        internal static string TestToString(FormulaValue result)
+        {
+            StringBuilder sb = new StringBuilder();
+            try
+            {
+                TestToString(result, sb);
+            }
+            catch (Exception e)
+            {
+                // This will cause a diff and test failure below. 
+                sb.Append($"<exception writing result: {e.Message}>");
+            }
+
+            string actualStr = sb.ToString();
+            return actualStr;
+        }
+
+        // $$$ Move onto FormulaValue. 
+        // Result here should be a string value that could be parsed. 
+        // Normalize so we can use this in test cases. 
+        internal static void TestToString(FormulaValue result, StringBuilder sb)
+        {
+            if (result is DecimalValue dec)
+            {
+                sb.Append(dec.Value);
+            }
+            else if (result is NumberValue n)
+            {
+                sb.Append(n.Value);
+            }
+            else if (result is BooleanValue b)
+            {
+                sb.Append(b.Value ? "true" : "false");
+            }
+            else if (result is StringValue s)
+            {
+                // $$$ proper escaping?
+                sb.Append('"' + s.Value + '"');
+            }
+            else if (result is TableValue t)
+            {
+                var tableType = (TableType)t.Type;
+                var canUseSquareBracketSyntax = t.IsColumn && t.Rows.All(r => r.IsValue) && tableType.FieldNames.First() == "Value";
+                if (canUseSquareBracketSyntax)
+                {
+                    sb.Append('[');
+                }
+                else
+                {
+                    sb.Append("Table(");
+                }
+
+                var dil = string.Empty;
+                foreach (var row in t.Rows)
+                {
+                    sb.Append(dil);
+                    dil = ",";
+
+                    if (canUseSquareBracketSyntax)
+                    {
+                        var val = row.Value.Fields.First().Value;
+                        TestToString(val, sb);
+                    }
+                    else
+                    {
+                        if (row.IsValue)
+                        {
+                            TestToString(row.Value, sb);
+                        }
+                        else
+                        {
+                            TestToString(row.ToFormulaValue(), sb);
+                        }
+                    }
+
+                    dil = ",";
+                }
+
+                if (canUseSquareBracketSyntax)
+                {
+                    sb.Append(']');
+                }
+                else
+                {
+                    sb.Append(')');
+                }
+            }
+            else if (result is RecordValue r)
+            {
+                var fields = r.Fields.ToArray();
+                Array.Sort(fields, (a, c) => string.CompareOrdinal(a.Name, c.Name));
+
+                sb.Append('{');
+                var dil = string.Empty;
+
+                foreach (var field in fields)
+                {
+                    sb.Append(dil);
+                    sb.Append(field.Name);
+                    sb.Append(':');
+                    TestToString(field.Value, sb);
+
+                    dil = ",";
+                }
+
+                sb.Append('}');
+            }
+            else if (result is TimeValue tv)
+            {
+                sb.Append(tv.Value.ToString());
+            }
+            else if (result is BlankValue)
+            {
+                sb.Append("Blank()");
+            }
+            else if (result is DateValue d)
+            {
+                // Date(YYYY,MM,DD)
+                var date = d.GetConvertedValue(null);
+                sb.Append($"Date({date.Year},{date.Month},{date.Day})");
+            }
+            else if (result is DateTimeValue dt)
+            {
+                // DateTime(yyyy,MM,dd,HH,mm,ss,fff)
+                var dateTime = dt.GetConvertedValue(null);
+                sb.Append($"DateTime({dateTime.Year},{dateTime.Month},{dateTime.Day},{dateTime.Hour},{dateTime.Minute},{dateTime.Second},{dateTime.Millisecond})");
+            }
+            else if (result is ErrorValue)
+            {
+                sb.Append(result);
+            }
+            else
+            {
+                throw new InvalidOperationException($"unsupported value type: {result.GetType().Name}");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/PowerFxDemoLibrary/PowerFxDemoLibrary.csproj b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/PowerFxDemoLibrary.csproj
new file mode 100644
index 0000000..e4f9fd9
--- /dev/null
+++ b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/PowerFxDemoLibrary.csproj
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7BACE988-ECCE-4A1A-AF7F-2A400BBF9601}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PowerFxDemoLibrary</RootNamespace>
+    <AssemblyName>PowerFxDemoLibrary</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.PowerFx.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.PowerFx.Core.1.1.0\lib\netstandard2.0\Microsoft.PowerFx.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.PowerFx.Interpreter, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.PowerFx.Interpreter.1.1.0\lib\netstandard2.0\Microsoft.PowerFx.Interpreter.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.PowerFx.Json, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.PowerFx.Json.1.1.0\lib\netstandard2.0\Microsoft.PowerFx.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.PowerFx.Repl, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.PowerFx.Repl.1.1.0\lib\netstandard2.0\Microsoft.PowerFx.Repl.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.PowerFx.Transport.Attributes, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.PowerFx.Transport.Attributes.1.1.0\lib\netstandard2.0\Microsoft.PowerFx.Transport.Attributes.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.6.0.0\lib\net461\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Core" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encodings.Web, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=6.0.0.8, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.6.0.8\lib\net461\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Evaluation.cs" />
+    <Compile Include="HelperClass.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+	<Target Name="CopyReferences" AfterTargets="Build">
+    <Message Text="Copy binaries to reference folder" Importance="High" />
+    <ItemGroup>
+      <Dlls Include="$(OutDir)*.dll" />
+      <Pdbs Include="$(OutDir)*.pdb" />
+      <Xmls Include="$(OutDir)*.xml" />
+      <Configs Include="$(OutDir)*.config" />
+	  <ResourceDlls Include="$(OutDir)\en-US\*.dll" />
+    </ItemGroup>
+    <Copy SourceFiles="@(Dlls)" DestinationFolder="$(SolutionDir)\references\" />
+    <Copy SourceFiles="@(Pdbs)" DestinationFolder="$(SolutionDir)\references\" />
+    <Copy SourceFiles="@(Xmls)" DestinationFolder="$(SolutionDir)\references\" />
+    <Copy SourceFiles="@(Configs)" DestinationFolder="$(SolutionDir)\references\" />
+	<Copy SourceFiles="@(ResourceDlls)" DestinationFolder="$(SolutionDir)\references\" />
+	<Message Text="Finished copying references." Importance="High" />
+  </Target>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/PowerFxDemoLibrary/Properties/AssemblyInfo.cs b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..5fbe1a1
--- /dev/null
+++ b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PowerFx D365 Demo")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Dominik Downarowicz")]
+[assembly: AssemblyProduct("PowerFxDemoLibrary")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7bace988-ecce-4a1a-af7f-2a400bbf9601")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Samples/Dynamics365FODemo/PowerFxDemoLibrary/app.config b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/app.config
new file mode 100644
index 0000000..0453880
--- /dev/null
+++ b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.8" newVersion="6.0.0.5" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/PowerFxDemoLibrary/packages.config b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/packages.config
new file mode 100644
index 0000000..c6fea9b
--- /dev/null
+++ b/Samples/Dynamics365FODemo/PowerFxDemoLibrary/packages.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net472" />
+  <package id="Microsoft.PowerFx.Core" version="1.1.0" targetFramework="net472" />
+  <package id="Microsoft.PowerFx.Interpreter" version="1.1.0" targetFramework="net472" />
+  <package id="Microsoft.PowerFx.Json" version="1.1.0" targetFramework="net472" />
+  <package id="Microsoft.PowerFx.Repl" version="1.1.0" targetFramework="net472" />
+  <package id="Microsoft.PowerFx.Transport.Attributes" version="1.1.0" targetFramework="net472" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
+  <package id="System.Collections.Immutable" version="6.0.0" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
+  <package id="System.Text.Encodings.Web" version="6.0.0" targetFramework="net472" />
+  <package id="System.Text.Json" version="6.0.5" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
+</packages>
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/README.md b/Samples/Dynamics365FODemo/README.md
new file mode 100644
index 0000000..1ec2016
--- /dev/null
+++ b/Samples/Dynamics365FODemo/README.md
@@ -0,0 +1,15 @@
+# Introduction 
+Demonstrates using PowerFx in a Dynamics 365 Finance and Operations (D365F&O) environment (Platform Version PU61). PowerFx is used here to evaluate SalesOrder data.
+
+![PowerFx Demo in D365 F&O](media/d365demo.gif) 
+
+Additionally the custom function **ThrowError("...")** has been added to PowerFx. There is no concret use for that in the demo, I use the function to pass errors back to D365F&O. Outside the context of that demo, I implemented the **ThrowError** function for a validation framework where the customer can define by himeself with PowerFx the validation rules and throw errors without the need of a D365F&O developer.
+
+# Deploy and demo usage
+In the folder **DeployablePackage** is a ready to deploy package for D365F&O works. Can be deployed like any other package for D365F&O. To run the demo script you then only need to call the **SysClassRunner** in the URL.
+
+**Example: https://<your F&O url>/?cmp=USMF&mi=SysClassRunner&cls=PowerFxDemoRunnable**
+        
+# Build
+If you want to build the project by yourself on a cloud-hosted environment or local VHD image, do not forget to use the registerSymbolicLink.ps1 to link the Metadata folder to the AosService/PackagesLocalDirectory of the machine. You can also build the project on a new [Unified Experience environment](https://learn.microsoft.com/en-us/power-platform/developer/unified-experience/finance-operations-dev-overview). (2023-11-24: Unified experience environments are in preview and some features might not work).
+
diff --git a/Samples/Dynamics365FODemo/copyReferences.ps1 b/Samples/Dynamics365FODemo/copyReferences.ps1
new file mode 100644
index 0000000..9c311e5
--- /dev/null
+++ b/Samples/Dynamics365FODemo/copyReferences.ps1
@@ -0,0 +1,5 @@
+$buildPath = ".\PowerFxDemoLibrary\bin\Debug"
+$dest = ".\references"
+
+copy-item -path $buildPath\* -destination $dest -include *.dll
+copy-item -path $buildPath\en-US\* -destination $dest -include *.dll
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/media/d365demo.gif b/Samples/Dynamics365FODemo/media/d365demo.gif
new file mode 100644
index 0000000..7d3f6b9
Binary files /dev/null and b/Samples/Dynamics365FODemo/media/d365demo.gif differ
diff --git a/Samples/Dynamics365FODemo/registerSymbolicLink.ps1 b/Samples/Dynamics365FODemo/registerSymbolicLink.ps1
new file mode 100644
index 0000000..ee7c2ae
--- /dev/null
+++ b/Samples/Dynamics365FODemo/registerSymbolicLink.ps1
@@ -0,0 +1,15 @@
+$AOSMetadataPath = "K:\AOSService\PackagesLocalDirectory"
+
+If(!(Test-Path -Path $AOSMetadataPath))
+{
+      $AOSMetadataPath = "C:\AOSService\PackagesLocalDirectory"
+}
+
+$RepoPath = "."
+$RepoMetadataPath = $RepoPath + "\Metadata"
+$RepoModelFolders = Get-ChildItem $RepoMetadataPath -Directory
+foreach ($ModelFolder in $RepoModelFolders)
+{
+	$Target = "$RepoMetadataPath\$ModelFolder"
+	New-Item -ItemType SymbolicLink -Path "$AOSMetadataPath" -Name "$ModelFolder" -Value "$Target"
+}
\ No newline at end of file
diff --git a/Samples/Dynamics365FODemo/unregisterSymbolicLink.ps1 b/Samples/Dynamics365FODemo/unregisterSymbolicLink.ps1
new file mode 100644
index 0000000..7ee62f1
--- /dev/null
+++ b/Samples/Dynamics365FODemo/unregisterSymbolicLink.ps1
@@ -0,0 +1,14 @@
+$AOSMetadataPath = "K:\AOSService\PackagesLocalDirectory"
+
+If(!(Test-Path -Path $AOSMetadataPath))
+{
+      $AOSMetadataPath = "C:\AOSService\PackagesLocalDirectory"
+}
+
+$RepoPath = "."
+$RepoMetadataPath = $RepoPath + "\Metadata"
+$RepoModelFolders = Get-ChildItem $RepoMetadataPath -Directory
+foreach ($ModelFolder in $RepoModelFolders)
+{
+	cmd /c rmdir "$AOSMetadataPath\$ModelFolder"
+}
\ No newline at end of file