diff --git a/.sf/config.json b/.sf/config.json
index d87727f..e156d66 100644
--- a/.sf/config.json
+++ b/.sf/config.json
@@ -1,3 +1,3 @@
 {
-  "target-org": "sgawali@df15.com"
+  "target-org": "Staging ORG"
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 76decfb..61ff0f6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,5 +3,6 @@
     "**/node_modules": true,
     "**/bower_components": true,
     "**/.sfdx": true
-  }
+  },
+  "salesforcedx-vscode-apex.java.home": "C:\\\\Program Files\\\\Zulu\\\\zulu-17"
 }
diff --git a/README.md b/README.md
index daf6309..00621d9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# Project Management Tool - PMT
+
+
 
 Free end-to-end project management solution built by Salesforce
 
@@ -18,4 +19,9 @@ With PMT, you can easily structure your projects and track progress to
 
 *COLLABORATION*: Embedded collaboration moves projects along quickly, even when multiple teams and regions are involved. Post to Chatter if you need to swap a resource.
 
-*ISSUE MANAGEMENT*: Escalate business critical issues/risks/bugs with Cases. Focus on resolving late projects with path to green.
\ No newline at end of file
+*ISSUE MANAGEMENT*: Escalate business critical issues/risks/bugs with Cases. Focus on resolving late projects with path to green.
+
+<a href="https://githubsfdeploy.herokuapp.com">
+  <img alt="Deploy to Salesforce"
+       src="https://raw.githubusercontent.com/afawcett/githubsfdeploy/master/deploy.png">
+</a>
diff --git a/force-app/main/default/globalValueSets/PMT_Roles.globalValueSet-meta.xml b/force-app/main/default/globalValueSets/PMT_Roles.globalValueSet-meta.xml
index 9d35623..c43e7ca 100755
--- a/force-app/main/default/globalValueSets/PMT_Roles.globalValueSet-meta.xml
+++ b/force-app/main/default/globalValueSets/PMT_Roles.globalValueSet-meta.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GlobalValueSet xmlns="http://soap.sforce.com/2006/04/metadata">
     <customValue>
-        <fullName>Sponsor</fullName>
+        <fullName>Project Sponsor</fullName>
         <default>false</default>
-        <label>Sponsor</label>
+        <label> Project Sponsor</label>
     </customValue>
     <customValue>
-        <fullName>Project Owner</fullName>
+        <fullName>Program Director</fullName>
         <default>false</default>
-        <label>Project Owner</label>
+        <label>Program Director</label>
     </customValue>
     <customValue>
-        <fullName>PMO</fullName>
+        <fullName>Program Manager</fullName>
         <default>false</default>
-        <label>PMO</label>
+        <label>Program Manager</label>
     </customValue>
     <customValue>
-        <fullName>SME</fullName>
+        <fullName>Monotoring and Evaluation</fullName>
         <default>false</default>
-        <label>SME</label>
+        <label>Monitoring and Evaluation</label>
     </customValue>
     <customValue>
         <fullName>IT</fullName>
diff --git a/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Allocated_Resource_Id__c.field-meta.xml b/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Allocated_Resource_Id__c.field-meta.xml
index 88839b6..6741487 100755
--- a/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Allocated_Resource_Id__c.field-meta.xml
+++ b/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Allocated_Resource_Id__c.field-meta.xml
@@ -2,7 +2,7 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Allocated_Resource_Id__c</fullName>
     <externalId>false</externalId>
-    <formula>Resource_Availability__r.User__r.Id</formula>
+    <formula>Resource_Availability__r.Flair_Employee__r.Id</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>Allocated Resource Id</label>
     <required>false</required>
diff --git a/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Resource_IsActive__c.field-meta.xml b/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Resource_IsActive__c.field-meta.xml
index 0d8fd73..258601e 100755
--- a/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Resource_IsActive__c.field-meta.xml
+++ b/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Resource_IsActive__c.field-meta.xml
@@ -2,7 +2,7 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Resource_IsActive__c</fullName>
     <externalId>false</externalId>
-    <formula>Resource_Availability__r.User__r.IsActive</formula>
+    <formula>Resource_Availability__r.Flair_Employee__r.flair__Active__c</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>Resource IsActive</label>
     <trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Resource_Name__c.field-meta.xml b/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Resource_Name__c.field-meta.xml
index b911de7..e426dd9 100755
--- a/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Resource_Name__c.field-meta.xml
+++ b/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/Resource_Name__c.field-meta.xml
@@ -2,7 +2,7 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Resource_Name__c</fullName>
     <externalId>false</externalId>
-    <formula>Resource_Availability__r.User__r.FirstName + &quot; &quot; + Resource_Availability__r.User__r.LastName</formula>
+    <formula>Resource_Availability__r.Flair_Employee__r.Name</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>Resource Name</label>
     <required>false</required>
diff --git a/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/User_Department__c.field-meta.xml b/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/User_Department__c.field-meta.xml
index 1fb8a31..c422d3d 100755
--- a/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/User_Department__c.field-meta.xml
+++ b/force-app/main/default/objects/PMT_Resource_Allocation__c/fields/User_Department__c.field-meta.xml
@@ -3,7 +3,7 @@
     <fullName>User_Department__c</fullName>
     <description>Shows Users department name</description>
     <externalId>false</externalId>
-    <formula>Resource_Availability__r.User__r.Department</formula>
+    <formula>Resource_Availability__r.Flair_Employee__r.flair__Department__r.Name</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>User Department</label>
     <required>false</required>
diff --git a/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Department__c.field-meta.xml b/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Department__c.field-meta.xml
index fb27d1f..dd33290 100755
--- a/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Department__c.field-meta.xml
+++ b/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Department__c.field-meta.xml
@@ -2,7 +2,7 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>User_Department__c</fullName>
     <externalId>false</externalId>
-    <formula>User__r.Department</formula>
+    <formula>Flair_Employee__r.flair__Department__r.Name</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>User Department</label>
     <required>false</required>
diff --git a/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Id__c.field-meta.xml b/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Id__c.field-meta.xml
index 65ca86b..ab53b19 100755
--- a/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Id__c.field-meta.xml
+++ b/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Id__c.field-meta.xml
@@ -3,7 +3,7 @@
     <fullName>User_Id__c</fullName>
     <description>This formula field is used by the resource allocation functionality</description>
     <externalId>false</externalId>
-    <formula>IF(is_Dummy_Availability__c,&apos;DUM&apos;, CASESAFEID(User__r.Id))</formula>
+    <formula>IF(is_Dummy_Availability__c,&apos;DUM&apos;, CASESAFEID(Flair_Employee__r.Id))</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>User Id</label>
     <required>false</required>
diff --git a/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_IsActive__c.field-meta.xml b/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_IsActive__c.field-meta.xml
index da58477..992ea74 100755
--- a/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_IsActive__c.field-meta.xml
+++ b/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_IsActive__c.field-meta.xml
@@ -3,7 +3,7 @@
     <fullName>User_IsActive__c</fullName>
     <description>Shows user is active or not</description>
     <externalId>false</externalId>
-    <formula>User__r.IsActive</formula>
+    <formula>Flair_Employee__r.flair__Active__c</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>User IsActive</label>
     <trackHistory>false</trackHistory>
diff --git a/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Name__c.field-meta.xml b/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Name__c.field-meta.xml
index 4563847..0dc56ce 100755
--- a/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Name__c.field-meta.xml
+++ b/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User_Name__c.field-meta.xml
@@ -2,7 +2,7 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>User_Name__c</fullName>
     <externalId>false</externalId>
-    <formula>IF(is_Dummy_Availability__c,&apos;&apos;, User__r.FirstName + &apos; &apos; +  User__r.LastName)</formula>
+    <formula>IF(is_Dummy_Availability__c,&apos;&apos;,Flair_Employee__r.Name)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>User Name</label>
     <required>false</required>
diff --git a/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User__c.field-meta.xml b/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User__c.field-meta.xml
index 7070bad..13f1039 100755
--- a/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User__c.field-meta.xml
+++ b/force-app/main/default/objects/PMT_Resource_Availability__c/fields/User__c.field-meta.xml
@@ -5,7 +5,7 @@
     <description>User for which availability is defined</description>
     <externalId>false</externalId>
     <label>User</label>
-    <referenceTo>User</referenceTo>
+    <referenceTo>Employee</referenceTo>
     <relationshipName>Resource_Availability</relationshipName>
     <required>false</required>
     <trackFeedHistory>false</trackFeedHistory>
diff --git a/force-app/main/default/objects/PMT_Setting__mdt/fields/Start_Month_of_Fiscal_Year__c.field-meta.xml b/force-app/main/default/objects/PMT_Setting__mdt/fields/Start_Month_of_Fiscal_Year__c.field-meta.xml
index 1ff7d35..5d3c033 100755
--- a/force-app/main/default/objects/PMT_Setting__mdt/fields/Start_Month_of_Fiscal_Year__c.field-meta.xml
+++ b/force-app/main/default/objects/PMT_Setting__mdt/fields/Start_Month_of_Fiscal_Year__c.field-meta.xml
@@ -7,7 +7,7 @@
     <fieldManageability>SubscriberControlled</fieldManageability>
     <inlineHelpText>This indicates the start of the fiscal year. For example, if value is 2 which means year starts from Feb, 3 for Mar, and so on</inlineHelpText>
     <label>Start Month of Fiscal Year</label>
-    <precision>2</precision>
+    <precision>1</precision>
     <required>true</required>
     <scale>0</scale>
     <type>Number</type>
diff --git a/force-app/main/default/objects/PMT_Task__c/fields/Assigned_To1__c.field-meta.xml b/force-app/main/default/objects/PMT_Task__c/fields/Assigned_To1__c.field-meta.xml
index 6048e34..1e8fb8a 100755
--- a/force-app/main/default/objects/PMT_Task__c/fields/Assigned_To1__c.field-meta.xml
+++ b/force-app/main/default/objects/PMT_Task__c/fields/Assigned_To1__c.field-meta.xml
@@ -4,7 +4,7 @@
     <deleteConstraint>SetNull</deleteConstraint>
     <externalId>false</externalId>
     <label>Assigned To</label>
-    <referenceTo>User</referenceTo>
+    <referenceTo>Employee</referenceTo>
     <relationshipName>PMT_Tasks</relationshipName>
     <required>false</required>
     <trackFeedHistory>false</trackFeedHistory>
diff --git a/force-app/main/default/settings/Company.settings-meta.xml b/force-app/main/default/settings/Company.settings-meta.xml
index 697cbd1..c929eaf 100755
--- a/force-app/main/default/settings/Company.settings-meta.xml
+++ b/force-app/main/default/settings/Company.settings-meta.xml
@@ -3,6 +3,6 @@
     <enableCustomFiscalYear>false</enableCustomFiscalYear>
     <fiscalYear>
         <fiscalYearNameBasedOn>endingMonth</fiscalYearNameBasedOn>
-        <startMonth>February</startMonth>
+        <startMonth>January</startMonth>
     </fiscalYear>
 </CompanySettings>