diff --git a/FFUDevelopment/USBImagingToolCreator.ps1 b/FFUDevelopment/USBImagingToolCreator.ps1
index c5c28ab..e5afece 100644
--- a/FFUDevelopment/USBImagingToolCreator.ps1
+++ b/FFUDevelopment/USBImagingToolCreator.ps1
@@ -1,20 +1,35 @@
 [CmdletBinding()]
 param(
     [Parameter(Mandatory = $True, Position = 0)]
-    [io.fileinfo] $DeployISOPath,
+    $DeployISOPath,
     [Switch]$DisableAutoPlay
 )
+$Host.UI.RawUI.WindowTitle = 'Imaging Tool USB Creator'
 
+if($DeployISOPath){
+$DevelopmentPath = $DeployISOPath | Split-Path
+$ImagesPath = "$DevelopmentPath\FFU"
 function WriteLog($LogText) { 
-    $LogFileName = '\Script.log'
-    $LogFile = $DevelopmentPath + $LogFilename
+$LogFileName = '\Script.log'
+$LogFile = $DevelopmentPath + $LogFilename
     Add-Content -path $LogFile -value "$((Get-Date).ToString()) $LogText" -Force -ErrorAction SilentlyContinue
     Write-Verbose $LogText
 }
 
-function Get-USBDrive {
-    $USBDrives = (Get-WmiObject -Class Win32_DiskDrive -Filter "MediaType='Removable Media'")
-    If ($USBDrives -and ($null -eq $USBDrives.count)) {
+function Write-ProgressLog {
+        param(
+            [string]$Activity,
+            [string]$Status
+        )
+        Write-Progress -Activity $Activity -Status $Status -PercentComplete (($currentStep / $totalSteps) * 100)
+        WriteLog $Status
+        $script:currentStep++
+      
+    }
+Function Get-RemovableDrive {
+writelog "Get information for all removable drives"
+$USBDrives = Get-WmiObject Win32_DiskDrive | Where-Object {$_.MediaType -eq "Removable media"} 
+If($USBDrives -and ($null -eq $USBDrives.count)) {
         $USBDrivesCount = 1
     } else {
         $USBDrivesCount = $USBDrives.Count
@@ -24,31 +39,33 @@ function Get-USBDrive {
     if ($null -eq $USBDrives) {
         WriteLog "No removable USB drive found. Exiting"
         Write-Error "No removable USB drive found. Exiting"
+        Pause
         exit 1
     }
-    return $USBDrives, $USBDrivesCount
-}
-
-function Build-DeploymentUSB {
-    param(
-        [Array]$Drives       
-    )
-    writelog "Checking if ffu files are present in the ffu folder"
-    $Images = Get-ChildItem -Path $FFUPath -Filter "*.ffu" -File -Recurse
-    writelog "Checking if drivers are present in the drivers folder"
-    $Drivers = Get-ChildItem -Path $DriversPath -Recurse
-    $DrivesCount = $Drives.Count
-    Writelog "Creating partitions..."
-    foreach ($USBDrive in $Drives) {
-        $DriveNumber = $USBDrive.DeviceID.Replace("\\.\PHYSICALDRIVE", "")
-        $Model = $USBDrive.model
-        $ScriptBlock = {
+  return $USBDrives, $USBDrivesCount
+  }
+  
+Function Build-DeploymentUSB{
+      param(
+            [Array]$Drives       
+            )
+            writelog "Creating list of FFU image files"
+            $Images = Get-ChildItem -Path $ImagesPath -Filter "*.ffu" -File -Recurse
+            writelog "Checking if drivers are present in the drivers folder"
+            $Drivers = Get-ChildItem -Path $DriversPath -Recurse
+            $DrivesCount = $Drives.Count
+            Write-ProgressLog "Create Imaging Tool" "Creating partitions..."
+            writelog "Create job to partition each usb drive"
+            foreach ($USBDrive in $Drives) {
+            $DriveNumber = $USBDrive.DeviceID.Replace("\\.\PHYSICALDRIVE", "")
+            $Model = $USBDrive.model
+            $ScriptBlock = {
             param($DriveNumber)
             Clear-Disk -Number $DriveNumber -RemoveData -RemoveOEM -Confirm:$false
             $Disk = Get-Disk -Number $DriveNumber
             $PartitionStyle = $Disk.PartitionStyle
-            if ($PartitionStyle -ne 'MBR') {
-                $Disk | Set-Disk -PartitionStyle MBR
+            if($PartitionStyle -ne 'MBR'){
+            $Disk | Set-Disk -PartitionStyle MBR
             }
             $BootPartition = New-Partition -DiskNumber $DriveNumber -Size 2GB -IsActive -AssignDriveLetter
             $DeployPartition = New-Partition -DiskNumber $DriveNumber -UseMaximumSize -AssignDriveLetter
@@ -60,178 +77,168 @@ function Build-DeploymentUSB {
     }
     writelog "Wait for partitioning jobs to complete"
     Get-Job | Wait-Job | Out-Null
-    if ($DrivesCount -gt 1) {
-        writelog "Get file system information for all drives"
-        $Partitions = Get-Partition | Get-Volume
+    if($DrivesCount -gt 1){
+    writelog "Get file system information for all drives"
+    $Partitions = Get-Partition | Get-Volume
     } else {
-        writelog "Get file system information for drive number $DiskNumber"
-        $Partitions = Get-Partition -DiskNumber $DriveNumber | Get-Volume
+    writelog "Get file system information for drive number $DiskNumber"
+    $Partitions = Get-Partition -DiskNumber $DriveNumber | Get-Volume
     }
-    writelog "Get drive letter for all volumes labeled:BOOT"
-    $BootDrives = ($Partitions | Where-Object { $_.FileSystemLabel -eq "BOOT" }).DriveLetter
-    writelog "Get drive letter for all volumes labeled:Deploy"
-    $DeployDrives = ($Partitions | Where-Object { $_.FileSystemLabel -eq "Deploy" }).DriveLetter
-    writelog "Mount Deployment .iso image"
-    $ISOMountPoint = (Mount-DiskImage -ImagePath "$DeployISOPath" -PassThru | Get-Volume).DriveLetter + ":\"
-    writelog "Copying boot files to all drives labeled BOOT concurrently"
-    foreach ($Drive in $BootDrives) {
-        $Destination = $Drive + ":\"
-        $jobScriptBlock = {
-            param (
-                [string]$SFolder,
-                [string]$DFolder
-            )
-            Robocopy $SFolder $DFolder /E /COPYALL /R:5 /W:5 /J
-        }
-        WriteLog "Start job to copy all boot files to $Destination"
-        Start-Job -ScriptBlock $jobScriptBlock -ArgumentList $ISOMountPoint, $Destination | Out-Null
+writelog "Get drive letter for all volumes labeled:BOOT"
+$BootDrives = ($Partitions | Where-Object { $_.FileSystemLabel -eq "BOOT"}).DriveLetter
+writelog "Get drive letter for all volumes labeled:Deploy"
+$DeployDrives = ($Partitions | Where-Object { $_.FileSystemLabel -eq "Deploy"}).DriveLetter
+writelog "Mount Deployment .iso image"
+$ISOMountPoint = (Mount-DiskImage -ImagePath "$DeployISOPath" -PassThru | Get-Volume).DriveLetter + ":\"
+writelog "Copying boot files to all drives labeled BOOT concurrently"
+foreach ($Drive in $BootDrives) {
+$Destination = $Drive + ":\"
+    $jobScriptBlock = {
+        param (
+            [string]$SFolder,
+            [string]$DFolder
+        )
+        Robocopy $SFolder $DFolder /E /COPYALL /R:5 /W:5 /J
+    }
+    WriteLog "Start job to copy all boot files to $Destination"
+    Start-Job -ScriptBlock $jobScriptBlock -ArgumentList $ISOMountPoint, $Destination | Out-Null
+}
+if($Images){
+writelog "Copying FFU image files to all drives labeled deploy concurrently"
+foreach ($Drive in $DeployDrives) {
+$Destination = $Drive + ":\"
+    $jobScriptBlock = {
+        param (
+            [string]$SFolder,
+            [string]$DFolder
+        )
+        New-Item -Path $DFolder -ItemType Directory -Force -Confirm: $false | Out-Null
+        Robocopy $SFolder $DFolder /E /COPYALL /R:5 /W:5 /J
     }
-    if ($Images) {
-        writelog "Copying FFU image files to all drives labeled deploy concurrently"
-        foreach ($Drive in $DeployDrives) {
-            $Destination = $Drive + ":\"
-            $jobScriptBlock = {
-                param (
-                    [string]$SFolder,
-                    [string]$DFolder
-                )
-                Robocopy $SFolder $DFolder /E /COPYALL /R:5 /W:5 /J
-            }
 
-            WriteLog "Start job to copy all FFU files to $Destination"
-            Start-Job -ScriptBlock $jobScriptBlock -ArgumentList $FFUPath, $Destination | Out-Null
+    WriteLog "Start job to copy all FFU files to $Destination"
+    Start-Job -ScriptBlock $jobScriptBlock -ArgumentList $ImagesPath, $Destination | Out-Null
+    }
+}
+if(!($Images)){
+    foreach ($Drive in $DeployDrives) {
+        WriteLog "Create images directory"
+        $drivepath = $Drive + ":\"
+        New-Item -Path "$drivepath" -Name Images -ItemType Directory -Force -Confirm: $false | Out-Null
         }
+}
+if($Drivers){
+writelog "Copying driver files to all drives labeled deploy concurrently"
+foreach ($Drive in $DeployDrives) {
+$Destination = $Drive + ":\Drivers"
+    $jobScriptBlock = {
+        param (
+            [string]$SFolder,
+            [string]$DFolder
+        )
+        New-Item -Path $DFolder -ItemType Directory -Force -Confirm: $false | Out-Null
+        Robocopy $SFolder $DFolder /E /COPYALL /R:5 /W:5 /J
     }
-    if ($Drivers) {
-        writelog "Copying driver files to all drives labeled deploy concurrently"
-        foreach ($Drive in $DeployDrives) {
-            $Destination = $Drive + ":\Drivers"
-            $jobScriptBlock = {
-                param (
-                    [string]$SFolder,
-                    [string]$DFolder
-                )
-                New-Item -Path $DFolder -ItemType Directory -Force -Confirm: $false | Out-Null
-                Robocopy $SFolder $DFolder /E /COPYALL /R:5 /W:5 /J
-            }
-            WriteLog "Start job to copy all drivers to $Destination"
-            Start-Job -ScriptBlock $jobScriptBlock -ArgumentList $DriversPath, $Destination | Out-Null
+    WriteLog "Start job to copy all drivers to $Destination"
+    Start-Job -ScriptBlock $jobScriptBlock -ArgumentList $DriversPath, $Destination | Out-Null
+}
+}
+if(!($Drivers)){
+   foreach ($Drive in $DeployDrives) {
+        WriteLog "Create drivers directory"
+        $drivepath = $Drive + ":\"
+        New-Item -Path "$drivepath" -Name Drivers -ItemType Directory -Force -Confirm: $false | Out-Null
         }
-    }
-    if (!($Drivers)) {
-        foreach ($Drive in $DeployDrives) {
-            WriteLog "Create drivers directory"
-            $drivepath = $Drive + ":\"
-            New-Item -Path "$drivepath" -Name Drivers -ItemType Directory -Force -Confirm: $false | Out-Null
-        }
-    }
-    if ($DrivesCount -gt 1) {
-        Writelog "Building $DrivesCount drives concurrently...Please be patient..."
-    } else {
-        Writelog "Building the imaging tool on $model...Please be patient..."
-    }
-    Get-Job | Wait-Job | Out-Null
+}
+if($DrivesCount -gt 1){
+Write-ProgressLog "Create Imaging Tool" "Building $DrivesCount drives concurrently...Please be patient..."
+} else {
+Write-ProgressLog "Create Imaging Tool" "Building the imaging tool on $model...Please be patient..."
+}
+Get-Job | Wait-Job | Out-Null
 
-    Dismount-DiskImage -ImagePath $DeployISOPath | Out-Null
-    Writelog "Drive creation jobs completed..."
+Dismount-DiskImage -ImagePath $DeployISOPath | Out-Null
+Write-ProgressLog "Create Imaging Tool" "Drive creation jobs completed..."
 }
 
-function New-DeploymentUSB {
+Function New-DeploymentUSB {
     param(
         [Array]$Drives,
         [int]$Count,
         [String]$FFUPath = "$DevelopmentPath\FFU",
         [String]$DriversPath = "$DevelopmentPath\Drivers"
-    
+        
     )
-
+  
     $Drivelist = @()
     writelog "Creating a USB drive selection list"
-    for ($i = 0; $i -le $Count - 1; $i++) {
+    for($i=0;$i -le $Count -1;$i++){
         $DriveModel = $Drives[$i].Model
-        $DriveSize = [math]::round($Drives[$i].size / 1GB, 2)
+        $DriveSize = [math]::round($Drives[$i].size/1GB, 2)
         $DiskNumber = $Drives[$i].DeviceID.Replace("\\.\PHYSICALDRIVE", "")
-        $Properties = [ordered]@{Number = $i + 1  ; DriveNumber = $DiskNumber ; DriveModel = $driveModel ; 'Size (GB)' = $DriveSize } 
-
+	    $Properties = [ordered]@{Number = $i + 1  ; DriveNumber = $DiskNumber ; DriveModel = $driveModel ; 'Size (GB)' = $DriveSize} 
+        
         $Drivelist += New-Object PSObject -Property $Properties
-    }
-    if ($Count -gt 1) {
-        $Last = $Count + 1
+        }
+        if($Count -gt 1){
+        $Last = $Count+1
         $Drivelist += New-Object -TypeName PSObject -Property @{ Number = "$last"; DriveModel = "Select this option to use all ($count) inserted USB Drives" }       
-    }
-    $Drivelist | Format-Table -AutoSize -Property Number, DriveModel , 'Size (GB)'
-    do {
+        }
+        $Drivelist | Format-Table -AutoSize -Property Number, DriveModel , 'Size (GB)'
+        do {
         try {
             $var = $true
             $DriveSelected = Read-Host 'Enter the drive number to apply the .iso to'
-            $DriveSelected = ($DriveSelected -as [int]) - 1
-            if ($Last) {
-                writelog "All drives selected"
+            $DriveSelected = ($DriveSelected -as [int]) -1
+            writelog "Drive $DriveSelected selected"
             }
-            else {
-                writelog "Drive $DriveSelected selected"
-            }
-        }
+
         catch {
             Write-Host 'Input was not in correct format. Please enter a valid FFU number'
             $var = $false
         }
-    } until (($DriveSelected -le $Count - 1 -or $last) -and $var)
-
-    $DisableAutoPlayCurrentSetting = (Get-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name DisableAutoplay).DisableAutoplay
-    if ($DisableAutoPlay -and $DisableAutoPlayCurrentSetting -ne 1) {
-        writelog "Disable autoPlay current setting is $DisableAutoPlayCurrentSetting"
-        WriteLog "Setting the registry key to disable autoplay for all drives"
-        Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Value 1 -Type DWORD
+    } until (($DriveSelected -le $Count -1 -or $last) -and $var)
+    if($DisableAutoPlay){ 
+    WriteLog "Setting the registry key to disable autoplay for all drives"
+    Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Value 1 -Type DWORD
     }
     WriteLog "Closing all MMC windows to prevent drive lock errors"
     Stop-Process -Name mmc -ErrorAction SilentlyContinue
     WriteLog "Closing all Diskpart windows to prevent drive lock errors"
     Stop-Process -Name diskpart -ErrorAction SilentlyContinue
     $Selection = $Drivelist[$DriveSelected].Number
-
-    if ($Selection -eq $last) {
-        Read-Host -Prompt "ALL DRIVES SELECTED! WILL ERASE ALL CURRENTLY CONNECTED USB DRIVES!! Press ENTER to continue"
-        Build-DeploymentUSB -Drives $Drives
+    $totalSteps = 5
+    if($Selection -eq $last){
+    Read-Host -Prompt "ALL DRIVES SELECTED! WILL ERASE ALL CURRENTLY CONNECTED USB DRIVES!! Press ENTER to continue"
+    Build-DeploymentUSB -Drives $Drives
     } else {
-        Read-Host -Prompt "Drive number $Selection was selected. Press ENTER to continue"
-        Build-DeploymentUSB -Drives $Drives[$DriveSelected]
+    Read-Host -Prompt "Drive number $Selection was selected. Press ENTER to continue"
+    Build-DeploymentUSB -Drives $Drives[$DriveSelected]
     }
     WriteLog "Setting the registry key to re-enable autoplay for all drives"
-    if ($DisableAutoPlay) {
-        Writelog "Setting disable autoplay setting back to $DisableAutoPlayCurrentSetting"
-        Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Value $DisableAutoPlayCurrentSetting -Type DWORD
+    if($DisableAutoPlay){
+    Write-ProgressLog "Create Imaging Tool" "Enabling Autoplay"
+    Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Value 0 -Type DWORD
     }
-    Writelog "Completed!"
+    Write-ProgressLog "Create Imaging Tool" "Completed!"
+}    
+#Get USB Drive and create log file
+if(Test-Path "$DevelopmentPath\Script.log"){
+Remove-Item -Path "$DevelopmentPath\Script.log" -Force -Confirm:$false
+New-item -Path $DevelopmentPath -Name 'Script.log' -ItemType "file" -Force | Out-Null
 }
+WriteLog 'Begin Logging'
+WriteLog 'Getting USB drive information and usb drive count'
+$USBDrives,$USBDrivesCount = Get-RemovableDrive
+WriteLog 'Setting first step for percentage progress bar'
+$currentStep = 1 
+New-DeploymentUSB -Drives $USBDrives -Count $USBDrivesCount
 
-$Host.UI.RawUI.WindowTitle = 'USB Imaging Tool Creator'
+read-host -Prompt "USB drive creation complete. Press ENTER to exit"
 
-# Check if path is relative
-if (-not [System.IO.Path]::IsPathRooted($DeployISOPath)) {
-    # Path is relative, Build full path
-    [io.fileinfo] $DeployISOPath = (Resolve-Path $DeployISOPath).Path
-    Write-Verbose "Path to ISO was relative. Attempting to resolve at: $($DeployISOPath.FullName)"
-}
-
-if ($DeployISOPath.Exists) {
-    $DevelopmentPath = $DeployISOPath.Directory.FullName
-
-    #Get USB Drive and create log file
-    if (Test-Path "$DevelopmentPath\Script.log") {
-        Remove-Item -Path "$DevelopmentPath\Script.log" -Force -Confirm:$false
-        New-item -Path $DevelopmentPath -Name 'Script.log' -ItemType "file" -Force | Out-Null
-    }
-
-    WriteLog 'Begin Logging'
-    WriteLog 'Getting USB drive information and usb drive count'
-
-    $USBDrives, $USBDrivesCount = Get-USBDrive
-
-    New-DeploymentUSB -Drives $USBDrives -Count $USBDrivesCount
-    
-    Read-Host -Prompt "USB drive creation complete. Press ENTER to exit"
-    Exit
+Exit
 } else {
-    Write-Error "Unable to locate ISO file at: $($DeployISOPath.FullName)"
+Write-Host "No .ISO file selected..."
+read-host "Press ENTER to Exit..."
+Exit
 }