diff --git a/.github/workflows/script.ps1 b/.github/workflows/script.ps1
deleted file mode 100644
index cb0657e..0000000
--- a/.github/workflows/script.ps1
+++ /dev/null
@@ -1,223 +0,0 @@
-#read variables from json for dev
-$json = (Get-Content "C:\One\SmartTrackingScriptDev\environment_df.json" -Raw) | ConvertFrom-Json
-Write-Output $json
-## Globals ##
-$CloudEnv = $json.cloudEnv
-$ResourceGroupName = $json.resourceGroupName
-$WorkspaceName = $json.workspaceName
-$Directory = $json.directory
-$Creds = $json.creds
-$contentTypes = $json.contentTypes
-$contentTypeMapping = @{
-    "AnalyticsRule"=@("Microsoft.OperationalInsights/workspaces/providers/alertRules", "Microsoft.OperationalInsights/workspaces/providers/alertRules/actions");
-    "AutomationRule"=@("Microsoft.OperationalInsights/workspaces/providers/automationRules");
-    "HuntingQuery"=@("Microsoft.OperationalInsights/workspaces/savedSearches");
-    "Parser"=@("Microsoft.OperationalInsights/workspaces/savedSearches");
-    "Playbook"=@("Microsoft.Web/connections", "Microsoft.Logic/workflows", "Microsoft.Web/customApis");
-    "Workbook"=@("Microsoft.Insights/workbooks");
-    "Metadata"=@("Microsoft.OperationalInsights/workspaces/providers/metadata");
-}
-
-if ([string]::IsNullOrEmpty($contentTypes)) {
-    $contentTypes = "AnalyticsRule,Metadata"
-}
-
-if (-not ($contentTypes.contains("Metadata"))) {
-    $contentTypes += ",Metadata"
-}
-
-$resourceTypes = $contentTypes.Split(",") | ForEach-Object { $contentTypeMapping[$_] } | ForEach-Object { $_.ToLower() }
-$MaxRetries = 3
-$secondsBetweenAttempts = 5
-
-function AttemptAzLogin($psCredential, $tenantId, $cloudEnv) {
-    $maxLoginRetries = 3
-    $delayInSeconds = 30
-    $retryCount = 1
-    $stopTrying = $false
-    do {
-        try {
-            Connect-AzAccount -ServicePrincipal -Tenant $tenantId -Credential $psCredential -Environment $cloudEnv | out-null;
-            Write-Host "Login Successful"
-            $stopTrying = $true
-        }
-        catch {
-            if ($retryCount -ge $maxLoginRetries) {
-                Write-Host "Login failed after $maxLoginRetries attempts."
-                $stopTrying = $true
-            }
-            else {
-                Write-Host "Login attempt failed, retrying in $delayInSeconds seconds."
-                Start-Sleep -Seconds $delayInSeconds
-                $retryCount++
-            }
-        }
-    }
-    while (-not $stopTrying)
-}
-
-function ConnectAzCloud {
-    $RawCreds = $Creds | ConvertFrom-Json
-
-    Clear-AzContext -Scope Process;
-    Clear-AzContext -Scope CurrentUser -Force -ErrorAction SilentlyContinue;
-    
-    Add-AzEnvironment `
-        -Name $CloudEnv `
-        -ActiveDirectoryEndpoint $RawCreds.activeDirectoryEndpointUrl `
-        -ResourceManagerEndpoint $RawCreds.resourceManagerEndpointUrl `
-        -ActiveDirectoryServiceEndpointResourceId $RawCreds.activeDirectoryServiceEndpointResourceId `
-        -GraphEndpoint $RawCreds.graphEndpointUrl | out-null;
-
-    $servicePrincipalKey = ConvertTo-SecureString $RawCreds.clientSecret.replace("'", "''") -AsPlainText -Force
-    $psCredential = New-Object System.Management.Automation.PSCredential($RawCreds.clientId, $servicePrincipalKey)
-
-    AttemptAzLogin $psCredential $RawCreds.tenantId $CloudEnv
-    Set-AzContext -Tenant $RawCreds.tenantId | out-null;
-}
-
-function IsValidTemplate($path, $templateObject) {
-    Try {
-        if (DoesContainWorkspaceParam $templateObject) {
-            Test-AzResourceGroupDeployment -ResourceGroupName $ResourceGroupName -TemplateFile $path -workspace $WorkspaceName
-        }
-        else {
-            Test-AzResourceGroupDeployment -ResourceGroupName $ResourceGroupName -TemplateFile $path
-        }
-
-        return $true
-    }
-    Catch {
-        Write-Host "[Warning] The file $path is not valid: $_"
-        return $false
-    }
-}
-
-function IsRetryable($deploymentName) {
-    $retryableStatusCodes = "Conflict","TooManyRequests","InternalServerError","DeploymentActive"
-    Try {
-        $deploymentResult = Get-AzResourceGroupDeploymentOperation -DeploymentName $deploymentName -ResourceGroupName $ResourceGroupName -ErrorAction Stop
-        return $retryableStatusCodes -contains $deploymentResult.StatusCode
-    }
-    Catch {
-        return $false
-    }
-}
-
-function IsValidResourceType($template) {
-    $isAllowedResources = $true
-    $template.resources | ForEach-Object { 
-        $isAllowedResources = $resourceTypes.contains($_.type.ToLower()) -and $isAllowedResources
-    }
-    return $isAllowedResources
-}
-
-function DoesContainWorkspaceParam($templateObject) {
-    $templateObject.parameters.PSobject.Properties.Name -contains "workspace"
-}
-
-function AttemptDeployment($path, $deploymentName, $templateObject) {
-    Write-Host "[Info] Deploying $path with deployment name $deploymentName"
-
-    $isValid = IsValidTemplate $path $templateObject
-    if (-not $isValid) {
-        return $false
-    }
-    $isSuccess = $false
-    $currentAttempt = 0
-    While (($currentAttempt -lt $MaxRetries) -and (-not $isSuccess)) 
-    {
-        $currentAttempt ++
-        Try 
-        {
-            if (DoesContainWorkspaceParam $templateObject) 
-            {
-                New-AzResourceGroupDeployment -Name $deploymentName -ResourceGroupName $ResourceGroupName -TemplateFile $path -workspace $workspaceName -ErrorAction Stop | Out-Host
-            }
-            else 
-            {
-                New-AzResourceGroupDeployment -Name $deploymentName -ResourceGroupName $ResourceGroupName -TemplateFile $path -ErrorAction Stop | Out-Host
-            }
-            
-            $isSuccess = $true
-        }
-        Catch [Exception] 
-        {
-            $err = $_
-            if (-not (IsRetryable $deploymentName)) 
-            {
-                Write-Host "[Warning] Failed to deploy $path with error: $err"
-                break
-            }
-            else 
-            {
-                if ($currentAttempt -le $MaxRetries) 
-                {
-                    Write-Host "[Warning] Failed to deploy $path with error: $err. Retrying in $secondsBetweenAttempts seconds..."
-                    Start-Sleep -Seconds $secondsBetweenAttempts
-                }
-                else
-                {
-                    Write-Host "[Warning] Failed to deploy $path after $currentAttempt attempts with error: $err"
-                }
-            }
-        }
-    }
-    return $isSuccess
-}
-
-function GenerateDeploymentName() {
-    $randomId = [guid]::NewGuid()
-    return "Sentinel_Deployment_$randomId"
-}
-
-function main() {
-    if ($CloudEnv -ne 'AzureCloud') 
-    {
-        Write-Output "Attempting Sign In to Azure Cloud"
-        ConnectAzCloud
-    }
-
-    Write-Output "Starting Deployment for Files in path: $Directory"
-
-    if (Test-Path -Path $Directory) 
-    {
-        $totalFiles = 0;
-        $totalFailed = 0;
-        Get-ChildItem -Path $Directory -Recurse -Filter *.json |
-        ForEach-Object {
-            $path = $_.FullName
-	        try {
-	            $totalFiles ++
-                $templateObject = Get-Content $path | Out-String | ConvertFrom-Json
-                if (-not (IsValidResourceType $templateObject))
-                {
-                    Write-Output "[Warning] Skipping deployment for $path. The file contains resources for content that was not selected for deployment. Please add content type to connection if you want this file to be deployed."
-                    return
-                }
-                $deploymentName = GenerateDeploymentName
-                $isSuccess = AttemptDeployment $_.FullName $deploymentName $templateObject
-                if (-not $isSuccess) 
-                {
-                    $totalFailed++
-                }
-            }
-	        catch {
-                $totalFailed++
-                Write-Host "[Error] An error occurred while trying to deploy file $path. Exception details: $_"
-                Write-Host $_.ScriptStackTrace
-            }
-	    }
-        if ($totalFiles -gt 0 -and $totalFailed -gt 0) 
-        {
-            $err = "$totalFailed of $totalFiles deployments failed."
-            Throw $err
-        }
-    }
-    else 
-    {
-        Write-Output "[Warning] $Directory not found. nothing to deploy"
-    }
-}
-
-main
\ No newline at end of file
diff --git a/.github/workflows/testWorkflow.yml b/.github/workflows/testWorkflow.yml
deleted file mode 100644
index 78dc3ec..0000000
--- a/.github/workflows/testWorkflow.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: CI
-
-# Controls when the workflow will run
-on:
-  # Triggers the workflow on push or pull request events but only for the main branch
-  push:
-    branches: [ main ]
-  pull_request:
-    types: [assigned, opened, synchronize, reopened]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      # Runs a single command using the runners shell
-      - name: Run a one-line script
-        run: echo Hello, world!
-
-      # Runs a set of commands using the runners shell
-      - name: Run a multi-line script
-        run: |
-          echo Add other actions to build,
-          echo test, and deploy your project.
diff --git a/.gitignore b/.gitignore
index f925b1a..cca4362 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-environment*
\ No newline at end of file
+environment*
+currentTemplate*
diff --git a/.github/workflows/smart_script.ps1 b/currentUpdateScript.ps1
similarity index 56%
rename from .github/workflows/smart_script.ps1
rename to currentUpdateScript.ps1
index cdaa6b2..132e079 100644
--- a/.github/workflows/smart_script.ps1
+++ b/currentUpdateScript.ps1
@@ -1,13 +1,10 @@
-#read variables from json for dev
-$json = (Get-Content "C:\One\SmartTrackingScriptDev\environment_df.json" -Raw) | ConvertFrom-Json
-Write-Output $json
 ## Globals ##
-$CloudEnv = $json.cloudEnv
-$ResourceGroupName = $json.resourceGroupName
-$WorkspaceName = $json.workspaceName
-$Directory = $json.directory
-$Creds = $json.creds
-$contentTypes = $json.contentTypes
+$CloudEnv = $Env:cloudEnv
+$ResourceGroupName = $Env:resourceGroupName
+$WorkspaceName = $Env:workspaceName
+$Directory = $Env:directory
+$Creds = $Env:creds
+$contentTypes = $Env:contentTypes
 $contentTypeMapping = @{
     "AnalyticsRule"=@("Microsoft.OperationalInsights/workspaces/providers/alertRules", "Microsoft.OperationalInsights/workspaces/providers/alertRules/actions");
     "AutomationRule"=@("Microsoft.OperationalInsights/workspaces/providers/automationRules");
@@ -17,11 +14,13 @@ $contentTypeMapping = @{
     "Workbook"=@("Microsoft.Insights/workbooks");
     "Metadata"=@("Microsoft.OperationalInsights/workspaces/providers/metadata");
 }
-$csvPath = ".github\workflows\tracking_table.csv"
-$githubAuthToken = $json.githubAuthToken
-$githubRepository = $json.githubRepository
-$branchName = "main" #change to variable passed through workflow
-$manualDeployment = $json.manualDeployment
+$sourceControlId = $Env:sourceControlId 
+$githubAuthToken = $Env:githubAuthToken
+$githubRepository = $Env:GITHUB_REPOSITORY
+$branchName = $Env:branch
+$manualDeployment = $Env:manualDeployment
+$csvPath = ".github\workflows\tracking_table_$sourceControlId.csv"
+$global:localCsvTablefinal = @{}
 
 if ([string]::IsNullOrEmpty($contentTypes)) {
     $contentTypes = "AnalyticsRule,Metadata"
@@ -35,59 +34,87 @@ $resourceTypes = $contentTypes.Split(",") | ForEach-Object { $contentTypeMapping
 $MaxRetries = 3
 $secondsBetweenAttempts = 5
 
-function CreateAndPopulateCsv {
-    if (!(Test-Path $csvPath)) {
-        Add-Content -Path $csvPath -Value "FileName, CommitSha"
-        Write-Output "Created csv file."       
-    }
-    $shaTable = GetCommitShaTable
-    #write all filename, sha to csv file  
-    $shaTable.GetEnumerator() | ForEach-Object {
-        "{0},{1}" -f $_.Key, $_.Value | add-content -path $csvPath
+#Converts hashtable to string that can be set as content when pushing csv file
+function ConvertTableToString {
+    $output = "FileName, CommitSha`n"
+    $global:localCsvTablefinal.GetEnumerator() | ForEach-Object {
+        $output += "{0},{1}`n" -f $_.Key, $_.Value
     }
+    return $output
 }
 
-function GetCommitShaTable {
-    $Header = @{
-        "authorization" = "Bearer $githubAuthToken"
-    }
-    #get branch sha and use it to get tree with all commit shas and files 
+$header = @{
+    "authorization" = "Bearer $githubAuthToken"
+}
+
+#Gets all files and commit shas using Get Trees API 
+function GetGithubTree {
     $branchResponse = Invoke-RestMethod https://api.github.com/repos/$githubRepository/branches/$branchName -Headers $header
     $treeUrl = "https://api.github.com/repos/$githubRepository/git/trees/" + $branchResponse.commit.sha + "?recursive=true"
     $getTreeResponse = Invoke-RestMethod $treeUrl -Headers $header
+    return $getTreeResponse
+}
+
+#Gets blob commit sha of the csv file, used when updating csv file to repo 
+function GetCsvCommitSha($getTreeResponse) {
+    return $getTreeResponse.tree |  Where-Object { $_.path -eq ".github/workflows/tracking_table_$sourceControlId.csv" }
+}
+
+#Creates a table using the reponse from the tree api, creates a table 
+function GetCommitShaTable($getTreeResponse) {
     $shaTable = @{}
-    $getTreeResponse.tree | ForEach-Object -Process {if ($_.path.Substring($_.path.Length-5) -eq ".json") {$shaTable.Add($_.path, $_.sha)}}
+    $getTreeResponse.tree | ForEach-Object {
+    if ([System.IO.Path]::GetExtension($_.path) -eq ".json") 
+        {
+            $truePath =  $_.path.Replace("/", "\")
+            $shaTable.Add($truePath, $_.sha)
+        }
+    }
     return $shaTable
 }
 
-#we need token provided by workflow run to push file, not installationtoken, will test later 
-function PushCsvToRepo {
-    #if exists, we need sha of csv file before pushing updated file. If new, no need 
-    $Header = @{
-        "authorization" = "Bearer $githubAuthToken"
-    }
-    $path = ".github/workflows/tracking_table.csv"
-    Write-Output $path
-    $createFileUrl = "https://api.github.com/repos/aaroncorreya/SmartTrackingScriptDev/contents/$path"
-    $content = Get-Content -Path $csvPath | Out-String
+#Pushes new/updated csv file to the user's repository. If updating file, will need csv commit sha. 
+function PushCsvToRepo($getTreeResponse) {
+    $path = ".github/workflows/tracking_table_$sourceControlId.csv"
+    $sha = GetCsvCommitSha $getTreeResponse
+    $createFileUrl = "https://api.github.com/repos/$githubRepository/contents/$path"
+    $content = ConvertTableToString
     $encodedContent = [System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($content))
-    Write-Output $encodedContent
+    
     $body = @{
         message = "trackingTable.csv created."
         content = $encodedContent
         branch = $branchName
+        sha = $sha
     }
 
     $Parameters = @{
         Method      = "PUT"
         Uri         = $createFileUrl
-        Headers     = $Header
+        Headers     = $header
         Body        = $body | ConvertTo-Json
     }
-    #Commit csv file
     Invoke-RestMethod @Parameters
 }
 
+function ReadCsvToTable {
+    $csvTable = Import-Csv -Path $csvPath
+    $HashTable=@{}
+    foreach($r in $csvTable)
+    {
+        $HashTable[$r.FileName]=$r.CommitSha
+    }   
+    return $HashTable    
+}
+
+#Checks and removes any deleted content files
+function CleanDeletedFilesFromTable {
+    $global:localCsvTablefinal.Clone().GetEnumerator() | ForEach-Object {
+        if (!(Test-Path -Path $_.Key)) {
+            $global:localCsvTablefinal.Remove($_.Key)
+        }
+    }
+}
 
 function AttemptAzLogin($psCredential, $tenantId, $cloudEnv) {
     $maxLoginRetries = 3
@@ -164,9 +191,15 @@ function IsRetryable($deploymentName) {
 }
 
 function IsValidResourceType($template) {
-    $isAllowedResources = $true
-    $template.resources | ForEach-Object { 
-        $isAllowedResources = $resourceTypes.contains($_.type.ToLower()) -and $isAllowedResources
+    try {
+        $isAllowedResources = $true
+        $template.resources | ForEach-Object { 
+            $isAllowedResources = $resourceTypes.contains($_.type.ToLower()) -and $isAllowedResources
+        }
+    }
+    catch {
+        Write-Host "[Error] Failed to check valid resource type."
+        $isAllowedResources = $false
     }
     return $isAllowedResources
 }
@@ -230,38 +263,39 @@ function GenerateDeploymentName() {
     return "Sentinel_Deployment_$randomId"
 }
 
-#modify this function to handle both manual deployment and smart tracking 
-function FullDeployment {
+function Deployment($fullDeploymentFlag, $remoteShaTable, $tree) {
+    Write-Host "Starting Deployment for Files in path: $Directory"
     if (Test-Path -Path $Directory) 
     {
         $totalFiles = 0;
         $totalFailed = 0;
         Get-ChildItem -Path $Directory -Recurse -Filter *.json |
         ForEach-Object {
-            $path = $_.FullName
-	        try {
-                #if manual deployment run this code
-	            $totalFiles ++
-                $templateObject = Get-Content $path | Out-String | ConvertFrom-Json
-                if (-not (IsValidResourceType $templateObject))
-                {
-                    Write-Output "[Warning] Skipping deployment for $path. The file contains resources for content that was not selected for deployment. Please add content type to connection if you want this file to be deployed."
-                    return
-                }
-                $deploymentName = GenerateDeploymentName
-                $isSuccess = AttemptDeployment $_.FullName $deploymentName $templateObject
-                if (-not $isSuccess) 
-                {
-                    $totalFailed++
-                }
-                #else run
+            $path = $_.FullName.Replace($Directory + "\", "")
+            $templateObject = Get-Content $path | Out-String | ConvertFrom-Json
+            if (-not (IsValidResourceType $templateObject))
+            {
+                Write-Host "[Warning] Skipping deployment for $path. The file contains resources for content that was not selected for deployment. Please add content type to connection if you want this file to be deployed."
+                return
+            }                    
+            if ($fullDeploymentFlag) {
+                $result = FullDeployment $path $templateObject
             }
-	        catch {
+            else {
+                $result = SmartDeployment $remoteShaTable $path $templateObject
+            }
+            if ($result.isSuccess -eq $false) {
                 $totalFailed++
-                Write-Host "[Error] An error occurred while trying to deploy file $path. Exception details: $_"
-                Write-Host $_.ScriptStackTrace
             }
-	    }
+            if (-not $result.skip) {
+                $totalFiles++
+            }
+            if ($result.isSuccess) {
+                $global:localCsvTablefinal[$path] = $remoteShaTable[$path]
+            }
+        }
+        CleanDeletedFilesFromTable
+        PushCsvToRepo $tree
         if ($totalFiles -gt 0 -and $totalFailed -gt 0) 
         {
             $err = "$totalFailed of $totalFiles deployments failed."
@@ -274,33 +308,59 @@ function FullDeployment {
     }
 }
 
+function FullDeployment($path, $templateObject) {
+    try {
+        $deploymentName = GenerateDeploymentName
+        return @{
+            skip = $false
+            isSuccess = AttemptDeployment $path $deploymentName $templateObject
+        }        
+    }
+    catch {
+        Write-Host "[Error] An error occurred while trying to deploy file $path. Exception details: $_"
+        Write-Host $_.ScriptStackTrace
+    }   
+}
+
+function SmartDeployment($remoteShaTable, $path, $templateObject) {
+    try {
+        $skip = $false
+        $existingSha = $global:localCsvTablefinal[$path]
+        $remoteSha = $remoteShaTable[$path]
+        if ((!$existingSha) -or ($existingSha -ne $remoteSha)) {
+            $deploymentName = GenerateDeploymentName
+            $isSuccess = AttemptDeployment $path $deploymentName $templateObject    
+        }
+        else {
+            $skip = $true
+            $isSuccess = $null  
+        }
+        return @{
+            skip = $skip
+            isSuccess = $isSuccess
+        }
+    }
+    catch {
+        Write-Host "[Error] An error occurred while trying to deploy file $path. Exception details: $_"
+        Write-Host $_.ScriptStackTrace
+    }
+}
+
 function main() {
-    # if ($CloudEnv -ne 'AzureCloud') 
-    # {
-    #     Write-Output "Attempting Sign In to Azure Cloud"
-    #     ConnectAzCloud
-    # }
-
-    if ((-not (Test-Path $csvPath)) -or ($manualDeployment -eq "true")) {
-        Write-Output "Starting Full Deployment for Files in path: $Directory"
-        CreateAndPopulateCsv
-        #TODO: push csv to repo
-        FullDeployment
+    if ($CloudEnv -ne 'AzureCloud') 
+    {
+        Write-Output "Attempting Sign In to Azure Cloud"
+        ConnectAzCloud
     }
-    #else run smart tracking
-    else {
-        #Import-Csv -Path $csvPath
-        $mytable = Import-Csv -Path $csvPath
-        $HashTable=@{}
-        foreach($r in $mytable)
-        {
-            $HashTable[$r.FileName]=$r.CommitSha
-        }   
-        Write-Output $HashTable
+
+    if (Test-Path $csvPath) {
+        $global:localCsvTablefinal = ReadCsvToTable
     }
 
+    $fullDeploymentFlag = (-not (Test-Path $csvPath)) -or ($manualDeployment -eq "true")
+    $tree = GetGithubTree
+    $remoteShaTable = GetCommitShaTable $tree
+    Deployment $fullDeploymentFlag $remoteShaTable $tree
 }
 
-#main
-CreateAndPopulateCsv
-#PushCsvToRepo
\ No newline at end of file
+main
\ No newline at end of file