diff --git a/Functions/Setup/Connect-NetboxAPI.ps1 b/Functions/Setup/Connect-NetboxAPI.ps1
index 5626dfb..974cfc6 100644
--- a/Functions/Setup/Connect-NetboxAPI.ps1
+++ b/Functions/Setup/Connect-NetboxAPI.ps1
@@ -144,7 +144,9 @@
     } else {
         Write-Verbose "Found compatible version [$($script:NetboxConfig.NetboxVersion.'netbox-version')]!"
     }
-
+    
+    $script:NetboxConfig.ContentTypes = Get-NetboxContentType -Limit 500
+    
     $script:NetboxConfig.Connected = $true
     Write-Verbose "Successfully connected!"
 
diff --git a/Functions/Setup/Support/Get-NetboxContentType.ps1 b/Functions/Setup/Support/Get-NetboxContentType.ps1
new file mode 100644
index 0000000..192a6f2
--- /dev/null
+++ b/Functions/Setup/Support/Get-NetboxContentType.ps1
@@ -0,0 +1,89 @@
+function Get-NetboxContentType {
+<#
+    .SYNOPSIS
+        Get a content type definition from Netbox
+    
+    .DESCRIPTION
+        A detailed description of the Get-NetboxContentType function.
+    
+    .PARAMETER Model
+        A description of the Model parameter.
+    
+    .PARAMETER Id
+        The database ID of the contact role
+    
+    .PARAMETER App_Label
+        A description of the App_Label parameter.
+    
+    .PARAMETER Query
+        A standard search query that will match one or more contact roles.
+    
+    .PARAMETER Limit
+        Limit the number of results to this number
+    
+    .PARAMETER Offset
+        Start the search at this index in results
+    
+    .PARAMETER Raw
+        Return the unparsed data from the HTTP request
+    
+    .EXAMPLE
+        PS C:\> Get-NetboxContentType
+    
+    .NOTES
+        Additional information about the function.
+#>
+    
+    [CmdletBinding(DefaultParameterSetName = 'Query')]
+    param
+    (
+        [Parameter(ParameterSetName = 'Query',
+                   Position = 0)]
+        [string]$Model,
+        
+        [Parameter(ParameterSetName = 'ByID')]
+        [uint32[]]$Id,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$App_Label,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$Query,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint16]$Limit,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint16]$Offset,
+        
+        [switch]$Raw
+    )
+    
+    switch ($PSCmdlet.ParameterSetName) {
+        'ById' {
+            foreach ($ContentType_ID in $Id) {
+                $Segments = [System.Collections.ArrayList]::new(@('extras', 'content-types', $ContentType_ID))
+                
+                $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters -SkipParameterByName 'Id'
+                
+                $uri = BuildNewURI -Segments $URIComponents.Segments -Parameters $URIComponents.Parameters
+                
+                InvokeNetboxRequest -URI $uri -Raw:$Raw
+            }
+            
+            break
+        }
+        
+        default {
+            $Segments = [System.Collections.ArrayList]::new(@('extras', 'content-types'))
+            
+            $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters
+            
+            $uri = BuildNewURI -Segments $URIComponents.Segments -Parameters $URIComponents.Parameters
+            
+            InvokeNetboxRequest -URI $uri -Raw:$Raw
+            
+            break
+        }
+    }
+}
\ No newline at end of file
diff --git a/Functions/Setup/Support/SetupNetboxConfigVariable.ps1 b/Functions/Setup/Support/SetupNetboxConfigVariable.ps1
index a8ac41f..12e5e9c 100644
--- a/Functions/Setup/Support/SetupNetboxConfigVariable.ps1
+++ b/Functions/Setup/Support/SetupNetboxConfigVariable.ps1
@@ -13,6 +13,7 @@
             'Choices'       = @{
             }
             'APIDefinition' = $null
+            'ContentTypes' = $null
         }
     }
 
diff --git a/Functions/Tenancy/ContactAssignment/Get-NetboxContactAssignment.ps1 b/Functions/Tenancy/ContactAssignment/Get-NetboxContactAssignment.ps1
new file mode 100644
index 0000000..1f4e0e1
--- /dev/null
+++ b/Functions/Tenancy/ContactAssignment/Get-NetboxContactAssignment.ps1
@@ -0,0 +1,108 @@
+
+function Get-NetboxContactAssignment {
+<#
+    .SYNOPSIS
+        Get a contact Assignment from Netbox
+    
+    .DESCRIPTION
+        A detailed description of the Get-NetboxContactAssignment function.
+    
+    .PARAMETER Name
+        The specific name of the contact Assignment. Must match exactly as is defined in Netbox
+    
+    .PARAMETER Id
+        The database ID of the contact Assignment
+    
+    .PARAMETER Content_Type_Id
+        A description of the Content_Type_Id parameter.
+    
+    .PARAMETER Content_Type
+        A description of the Content_Type parameter.
+    
+    .PARAMETER Object_Id
+        A description of the Object_Id parameter.
+    
+    .PARAMETER Contact_Id
+        A description of the Contact_Id parameter.
+    
+    .PARAMETER Role_Id
+        A description of the Role_Id parameter.
+    
+    .PARAMETER Limit
+        Limit the number of results to this number
+    
+    .PARAMETER Offset
+        Start the search at this index in results
+    
+    .PARAMETER Raw
+        Return the unparsed data from the HTTP request
+    
+    .EXAMPLE
+        PS C:\> Get-NetboxContactAssignment
+    
+    .NOTES
+        Additional information about the function.
+#>
+    
+    [CmdletBinding(DefaultParameterSetName = 'Query')]
+    param
+    (
+        [Parameter(ParameterSetName = 'Query',
+                   Position = 0)]
+        [string]$Name,
+        
+        [Parameter(ParameterSetName = 'ByID')]
+        [uint32[]]$Id,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint32]$Content_Type_Id,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$Content_Type,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint32]$Object_Id,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint32]$Contact_Id,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint32]$Role_Id,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint16]$Limit,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint16]$Offset,
+        
+        [switch]$Raw
+    )
+    
+    switch ($PSCmdlet.ParameterSetName) {
+        'ById' {
+            foreach ($ContactAssignment_ID in $Id) {
+                $Segments = [System.Collections.ArrayList]::new(@('tenancy', 'contact-assignments', $ContactAssignment_ID))
+                
+                $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters -SkipParameterByName 'Id'
+                
+                $uri = BuildNewURI -Segments $URIComponents.Segments -Parameters $URIComponents.Parameters
+                
+                InvokeNetboxRequest -URI $uri -Raw:$Raw
+            }
+            
+            break
+        }
+        
+        default {
+            $Segments = [System.Collections.ArrayList]::new(@('tenancy', 'contact-assignments'))
+            
+            $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters
+            
+            $uri = BuildNewURI -Segments $URIComponents.Segments -Parameters $URIComponents.Parameters
+            
+            InvokeNetboxRequest -URI $uri -Raw:$Raw
+            
+            break
+        }
+    }
+}
\ No newline at end of file
diff --git a/Functions/Tenancy/ContactAssignment/New-NetboxContactAssignment.ps1 b/Functions/Tenancy/ContactAssignment/New-NetboxContactAssignment.ps1
new file mode 100644
index 0000000..9bc6a7c
--- /dev/null
+++ b/Functions/Tenancy/ContactAssignment/New-NetboxContactAssignment.ps1
@@ -0,0 +1,108 @@
+
+function New-NetboxContactRole {
+<#
+    .SYNOPSIS
+        Create a new contact role in Netbox
+    
+    .DESCRIPTION
+        Creates a new contact role object in Netbox
+    
+    .PARAMETER Content_Type
+        A description of the Content_Type parameter.
+    
+    .PARAMETER Object_Id
+        A description of the Object_Id parameter.
+    
+    .PARAMETER Contact
+        A description of the Contact parameter.
+    
+    .PARAMETER Role
+        A description of the Role parameter.
+    
+    .PARAMETER Priority
+        A description of the Priority parameter.
+    
+    .PARAMETER Raw
+        Return the unparsed data from the HTTP request
+    
+    .EXAMPLE
+        PS C:\> New-NetboxContactAssignment -Name 'Leroy Jenkins' -Email 'leroy.jenkins@example.com'
+    
+    .NOTES
+        Additional information about the function.
+#>
+    
+    [CmdletBinding(ConfirmImpact = 'Low',
+                   SupportsShouldProcess = $true)]
+    [OutputType([pscustomobject])]
+    param
+    (
+        [Parameter(Mandatory = $true,
+                   ValueFromPipelineByPropertyName = $true)]
+        [object]$Content_Type,
+        
+        [Parameter(Mandatory = $true)]
+        [uint32]$Object_Id,
+        
+        [Parameter(Mandatory = $true)]
+        [uint32]$Contact,
+        
+        [Parameter(Mandatory = $true)]
+        [uint32]$Role,
+        
+        [ValidateSet('primary', 'secondary', 'tertiary', 'inactive', IgnoreCase = $true)]
+        [string]$Priority,
+        
+        [switch]$Raw
+    )
+    
+    begin {
+        # https://docs.netbox.dev/en/stable/features/contacts/
+        $AllowedContentTypes = @{
+            10 = "circuits.circuit"
+            7  = "circuits.provider"
+            19 = "dcim.device"
+            25 = "dcim.location"
+            29 = "dcim.manufacturer"
+            77 = "dcim.powerpanel"
+            20 = "dcim.rack"
+            30 = "dcim.region"
+            18 = "dcim.site"
+            92 = "dcim.sitegroup"
+            58 = "tenancy.tenant"
+            63 = "virtualization.cluster"
+            64 = "virtualization.clustergroup"
+            61 = "virtualization.virtualmachine"
+        }
+    }
+    
+    process {
+        $Segments = [System.Collections.ArrayList]::new(@('tenancy', 'contact-assignment'))
+        $Method = 'POST'
+        
+        if ($Content_Type -is [string]) {
+            # Need to convert this to an integer
+            $Content_Type = ($AllowedContentTypes.GetEnumerator() | Where-Object {
+                    $_.Value -eq $Content_Type
+                }).Key
+        } elseif ($Content_Type -is [int]) {
+            if ($Content_Type -notin $($AllowedContentTypes).Keys) {
+                throw "Invalid content type defined"
+            }
+        } else {
+            throw "Invalid content type defined"
+        }
+        
+        $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters
+        
+        $URI = BuildNewURI -Segments $URIComponents.Segments
+        
+        if ($PSCmdlet.ShouldProcess($Address, 'Create new contact assignment')) {
+            InvokeNetboxRequest -URI $URI -Method $Method -Body $URIComponents.Parameters -Raw:$Raw
+        }
+    }
+}
+
+
+
+
diff --git a/Functions/Tenancy/ContactRoles/Get-NetboxContactRole.ps1 b/Functions/Tenancy/ContactRoles/Get-NetboxContactRole.ps1
new file mode 100644
index 0000000..f619189
--- /dev/null
+++ b/Functions/Tenancy/ContactRoles/Get-NetboxContactRole.ps1
@@ -0,0 +1,90 @@
+
+function Get-NetboxContactRole {
+<#
+    .SYNOPSIS
+        Get a contact role from Netbox
+    
+    .DESCRIPTION
+        A detailed description of the Get-NetboxContactRole function.
+    
+    .PARAMETER Name
+        The specific name of the contact role. Must match exactly as is defined in Netbox
+    
+    .PARAMETER Id
+        The database ID of the contact role
+    
+    .PARAMETER Query
+        A standard search query that will match one or more contact roles.
+    
+    .PARAMETER Limit
+        Limit the number of results to this number
+    
+    .PARAMETER Offset
+        Start the search at this index in results
+    
+    .PARAMETER Raw
+        Return the unparsed data from the HTTP request
+    
+    .EXAMPLE
+        PS C:\> Get-NetboxContactRole
+    
+    .NOTES
+        Additional information about the function.
+#>
+    
+    [CmdletBinding(DefaultParameterSetName = 'Query')]
+    param
+    (
+        [Parameter(ParameterSetName = 'Query',
+                   Position = 0)]
+        [string]$Name,
+        
+        [Parameter(ParameterSetName = 'ByID')]
+        [uint32[]]$Id,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$Query,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$Slug,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$Description,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint16]$Limit,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint16]$Offset,
+        
+        [switch]$Raw
+    )
+    
+    switch ($PSCmdlet.ParameterSetName) {
+        'ById' {
+            foreach ($ContactRole_ID in $Id) {
+                $Segments = [System.Collections.ArrayList]::new(@('tenancy', 'contact-roles', $ContactRole_ID))
+                
+                $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters -SkipParameterByName 'Id'
+                
+                $uri = BuildNewURI -Segments $URIComponents.Segments -Parameters $URIComponents.Parameters
+                
+                InvokeNetboxRequest -URI $uri -Raw:$Raw
+            }
+            
+            break
+        }
+        
+        default {
+            $Segments = [System.Collections.ArrayList]::new(@('tenancy', 'contact-roles'))
+            
+            $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters
+            
+            $uri = BuildNewURI -Segments $URIComponents.Segments -Parameters $URIComponents.Parameters
+            
+            InvokeNetboxRequest -URI $uri -Raw:$Raw
+            
+            break
+        }
+    }
+}
\ No newline at end of file
diff --git a/Functions/Tenancy/ContactRoles/New-NetboxContactRole.ps1 b/Functions/Tenancy/ContactRoles/New-NetboxContactRole.ps1
new file mode 100644
index 0000000..740383a
--- /dev/null
+++ b/Functions/Tenancy/ContactRoles/New-NetboxContactRole.ps1
@@ -0,0 +1,71 @@
+
+function New-NetboxContactRole {
+<#
+    .SYNOPSIS
+        Create a new contact role in Netbox
+    
+    .DESCRIPTION
+        Creates a new contact role object in Netbox
+    
+    .PARAMETER Name
+        The contact role name, e.g "Network Support"
+    
+    .PARAMETER Slug
+        The unique URL for the role. Can only contain hypens, A-Z, a-z, 0-9, and underscores
+    
+    .PARAMETER Description
+        Short description of the contact role
+    
+    .PARAMETER Custom_Fields
+        A description of the Custom_Fields parameter.
+    
+    .PARAMETER Raw
+        Return the unparsed data from the HTTP request
+    
+    .EXAMPLE
+        PS C:\> New-NetboxContact -Name 'Leroy Jenkins' -Email 'leroy.jenkins@example.com'
+    
+    .NOTES
+        Additional information about the function.
+#>
+    
+    [CmdletBinding(ConfirmImpact = 'Low',
+                   SupportsShouldProcess = $true)]
+    [OutputType([pscustomobject])]
+    param
+    (
+        [Parameter(Mandatory = $true,
+                   ValueFromPipelineByPropertyName = $true)]
+        [ValidateLength(1, 100)]
+        [string]$Name,
+        
+        [Parameter(Mandatory = $true)]
+        [ValidateLength(1, 100)]
+        [ValidatePattern('^[-a-zA-Z0-9_]+$')]
+        [string]$Slug,
+        
+        [ValidateLength(0, 200)]
+        [string]$Description,
+        
+        [hashtable]$Custom_Fields,
+        
+        [switch]$Raw
+    )
+    
+    process {
+        $Segments = [System.Collections.ArrayList]::new(@('tenancy', 'contacts'))
+        $Method = 'POST'
+        
+        $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters
+        
+        $URI = BuildNewURI -Segments $URIComponents.Segments
+        
+        if ($PSCmdlet.ShouldProcess($Address, 'Create new contact')) {
+            InvokeNetboxRequest -URI $URI -Method $Method -Body $URIComponents.Parameters -Raw:$Raw
+        }
+    }
+}
+
+
+
+
diff --git a/Functions/Tenancy/Contacts/Get-NetboxContact.ps1 b/Functions/Tenancy/Contacts/Get-NetboxContact.ps1
new file mode 100644
index 0000000..964b11f
--- /dev/null
+++ b/Functions/Tenancy/Contacts/Get-NetboxContact.ps1
@@ -0,0 +1,120 @@
+
+function Get-NetboxContact {
+<#
+    .SYNOPSIS
+        Get a contact from Netbox
+    
+    .DESCRIPTION
+        Obtain a contact or contacts from Netbox by ID or query
+    
+    .PARAMETER Name
+        The specific name of the Contact. Must match exactly as is defined in Netbox
+    
+    .PARAMETER Id
+        The database ID of the Contact
+    
+    .PARAMETER Query
+        A standard search query that will match one or more Contacts.
+    
+    .PARAMETER Email
+        Email address of the contact
+    
+    .PARAMETER Title
+        Title of the contact
+    
+    .PARAMETER Phone
+        Telephone number of the contact
+    
+    .PARAMETER Address
+        Physical address of the contact
+    
+    .PARAMETER Group
+        The specific group as defined in Netbox.
+    
+    .PARAMETER GroupID
+        The database ID of the group in Netbox
+    
+    .PARAMETER Limit
+        Limit the number of results to this number
+    
+    .PARAMETER Offset
+        Start the search at this index in results
+    
+    .PARAMETER Raw
+        Return the unparsed data from the HTTP request
+    
+    .EXAMPLE
+        PS C:\> Get-NetboxContact
+    
+    .NOTES
+        Additional information about the function.
+#>
+    
+    [CmdletBinding(DefaultParameterSetName = 'Query')]
+    param
+    (
+        [Parameter(ParameterSetName = 'Query',
+                   Position = 0)]
+        [string]$Name,
+        
+        [Parameter(ParameterSetName = 'ByID')]
+        [uint32[]]$Id,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$Query,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$Email,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$Title,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$Phone,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$Address,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [string]$Group,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint16]$GroupID,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint16]$Limit,
+        
+        [Parameter(ParameterSetName = 'Query')]
+        [uint16]$Offset,
+        
+        [switch]$Raw
+    )
+    
+    switch ($PSCmdlet.ParameterSetName) {
+        'ById' {
+            foreach ($Contact_ID in $Id) {
+                $Segments = [System.Collections.ArrayList]::new(@('tenancy', 'contacts', $Contact_ID))
+                
+                $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters -SkipParameterByName 'Id'
+                
+                $uri = BuildNewURI -Segments $URIComponents.Segments -Parameters $URIComponents.Parameters
+                
+                InvokeNetboxRequest -URI $uri -Raw:$Raw
+            }
+            
+            break
+        }
+        
+        default {
+            $Segments = [System.Collections.ArrayList]::new(@('tenancy', 'contacts'))
+            
+            $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters
+            
+            $uri = BuildNewURI -Segments $URIComponents.Segments -Parameters $URIComponents.Parameters
+            
+            InvokeNetboxRequest -URI $uri -Raw:$Raw
+            
+            break
+        }
+    }
+}
\ No newline at end of file
diff --git a/Functions/Tenancy/Contacts/New-NetboxContact.ps1 b/Functions/Tenancy/Contacts/New-NetboxContact.ps1
new file mode 100644
index 0000000..0e0bf02
--- /dev/null
+++ b/Functions/Tenancy/Contacts/New-NetboxContact.ps1
@@ -0,0 +1,99 @@
+
+function New-NetboxContact {
+<#
+    .SYNOPSIS
+        Create a new contact in Netbox
+    
+    .DESCRIPTION
+        Creates a new contact object in Netbox which can be linked to other objects
+    
+    .PARAMETER Name
+        The contacts full name, e.g "Leroy Jenkins"
+    
+    .PARAMETER Email
+        Email address of the contact
+    
+    .PARAMETER Title
+        Job title or other title related to the contact
+    
+    .PARAMETER Phone
+        Telephone number
+    
+    .PARAMETER Address
+        Physical address, usually mailing address
+    
+    .PARAMETER Description
+        Short description of the contact
+    
+    .PARAMETER Comments
+        Detailed comments. Markdown supported.
+    
+    .PARAMETER Link
+        URI related to the contact
+    
+    .PARAMETER Custom_Fields
+        A description of the Custom_Fields parameter.
+    
+    .PARAMETER Raw
+        A description of the Raw parameter.
+    
+    .EXAMPLE
+        PS C:\> New-NetboxContact -Name 'Leroy Jenkins' -Email 'leroy.jenkins@example.com'
+    
+    .NOTES
+        Additional information about the function.
+#>
+    
+    [CmdletBinding(ConfirmImpact = 'Low',
+                   SupportsShouldProcess = $true)]
+    [OutputType([pscustomobject])]
+    param
+    (
+        [Parameter(Mandatory = $true,
+                   ValueFromPipelineByPropertyName = $true)]
+        [ValidateLength(1, 100)]
+        [string]$Name,
+        
+        [Parameter(Mandatory = $true)]
+        [ValidateLength(0, 254)]
+        [string]$Email,
+        
+        [ValidateLength(0, 100)]
+        [string]$Title,
+        
+        [ValidateLength(0, 50)]
+        [string]$Phone,
+        
+        [ValidateLength(0, 200)]
+        [string]$Address,
+        
+        [ValidateLength(0, 200)]
+        [string]$Description,
+        
+        [string]$Comments,
+        
+        [ValidateLength(0, 200)]
+        [string]$Link,
+        
+        [hashtable]$Custom_Fields,
+        
+        [switch]$Raw
+    )
+    
+    process {
+        $Segments = [System.Collections.ArrayList]::new(@('tenancy', 'contacts'))
+        $Method = 'POST'
+        
+        $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters
+        
+        $URI = BuildNewURI -Segments $URIComponents.Segments
+        
+        if ($PSCmdlet.ShouldProcess($Address, 'Create new contact')) {
+            InvokeNetboxRequest -URI $URI -Method $Method -Body $URIComponents.Parameters -Raw:$Raw
+        }
+    }
+}
+
+
+
+
diff --git a/Functions/Tenancy/Get-NetboxTenant.ps1 b/Functions/Tenancy/Tenants/Get-NetboxTenant.ps1
similarity index 100%
rename from Functions/Tenancy/Get-NetboxTenant.ps1
rename to Functions/Tenancy/Tenants/Get-NetboxTenant.ps1
diff --git a/Functions/Tenancy/Tenants/New-NetboxTenant.ps1 b/Functions/Tenancy/Tenants/New-NetboxTenant.ps1
new file mode 100644
index 0000000..6f7da0f
--- /dev/null
+++ b/Functions/Tenancy/Tenants/New-NetboxTenant.ps1
@@ -0,0 +1,71 @@
+
+function New-NetboxTenant {
+<#
+    .SYNOPSIS
+        Create a new tenant in Netbox
+    
+    .DESCRIPTION
+        Creates a new tenant object in Netbox
+    
+    .PARAMETER Name
+        The tenant name, e.g "Contoso Inc"
+    
+    .PARAMETER Slug
+        The unique URL for the tenant. Can only contain hypens, A-Z, a-z, 0-9, and underscores
+    
+    .PARAMETER Description
+        Short description of the tenant
+    
+    .PARAMETER Custom_Fields
+        Hashtable of custom field values.
+    
+    .PARAMETER Raw
+        Return the unparsed data from the HTTP request
+    
+    .EXAMPLE
+        PS C:\> New-NetboxTenant -Name 'Contoso Inc' -Slug 'contoso-inc'
+    
+    .NOTES
+        Additional information about the function.
+#>
+    
+    [CmdletBinding(ConfirmImpact = 'Low',
+                   SupportsShouldProcess = $true)]
+    [OutputType([pscustomobject])]
+    param
+    (
+        [Parameter(Mandatory = $true,
+                   ValueFromPipelineByPropertyName = $true)]
+        [ValidateLength(1, 100)]
+        [string]$Name,
+        
+        [Parameter(Mandatory = $true)]
+        [ValidateLength(1, 100)]
+        [ValidatePattern('^[-a-zA-Z0-9_]+$')]
+        [string]$Slug,
+        
+        [ValidateLength(0, 200)]
+        [string]$Description,
+        
+        [hashtable]$Custom_Fields,
+        
+        [switch]$Raw
+    )
+    
+    process {
+        $Segments = [System.Collections.ArrayList]::new(@('tenancy', 'tenants'))
+        $Method = 'POST'
+        
+        $URIComponents = BuildURIComponents -URISegments $Segments -ParametersDictionary $PSBoundParameters
+        
+        $URI = BuildNewURI -Segments $URIComponents.Segments
+        
+        if ($PSCmdlet.ShouldProcess($Address, 'Create new tenant')) {
+            InvokeNetboxRequest -URI $URI -Method $Method -Body $URIComponents.Parameters -Raw:$Raw
+        }
+    }
+}
+
+
+
+
diff --git a/NetboxPS.psproj b/NetboxPS.psproj
index c37e1db..bad6789 100644
--- a/NetboxPS.psproj
+++ b/NetboxPS.psproj
@@ -1,7 +1,9 @@
-<Project Synchronized="False" SyncFilter="*.ps1;*.psm1;*.psd1;*.ps1xml;*.psf;*.pss;*.xml;*.help.txt" AutoExportFunctions="True" AutoExportPS1XMLFiles="False">
+<Project Synchronized="False" SyncFilter="*.ps1;*.psm1;*.psd1;*.ps1xml;*.psf;*.pss;*.xml;*.help.txt" AutoExportFunctions="True" ExportToLocalMachine="False" AutoExportPS1XMLFiles="False" StagingFolderName="bin">
   <Version>2.1</Version>
   <FileID>bba9b06c-49c8-47cf-8358-aca7c4e78896</FileID>
   <ProjectType>1</ProjectType>
+  <RememberPowerShellVersion>True</RememberPowerShellVersion>
+  <PowerShellVersion>Local Machine - PowerShell V5 (64 Bit)</PowerShellVersion>
   <Folders>
     <Folder>Functions</Folder>
     <Folder>Functions\DCIM</Folder>
@@ -28,6 +30,10 @@
     <Folder>Functions\Circuits\Providers</Folder>
     <Folder>Functions\Circuits\Types</Folder>
     <Folder>Functions\Circuits\Terminations</Folder>
+    <Folder>Functions\Tenancy\Contacts</Folder>
+    <Folder>Functions\Tenancy\Tenants</Folder>
+    <Folder>Functions\Tenancy\ContactRoles</Folder>
+    <Folder>Functions\Tenancy\ContactAssignment</Folder>
   </Folders>
   <Files>
     <File Build="2">NetboxPS.psd1</File>
@@ -68,7 +74,7 @@
     <File Build="0" Shared="True" ReferenceFunction="Invoke-New-NetboxIPAMPrefix_ps1" ExportFunctions="True">Functions\IPAM\Prefix\New-NetboxIPAMPrefix.ps1</File>
     <File Build="0" Shared="True" ReferenceFunction="Invoke-Remove-NetboxIPAMAddress_ps1" ExportFunctions="True">Functions\IPAM\Address\Remove-NetboxIPAMAddress.ps1</File>
     <File Build="0" Shared="True" ReferenceFunction="Invoke-Set-NetboxIPAMAddress_ps1" ExportFunctions="True">Functions\IPAM\Address\Set-NetboxIPAMAddress.ps1</File>
-    <File Build="0" Shared="True" ReferenceFunction="Invoke-Get-NetboxTenant_ps1" ExportFunctions="True">Functions\Tenancy\Get-NetboxTenant.ps1</File>
+    <File Build="0" Shared="True" ReferenceFunction="Invoke-Get-NetboxTenant_ps1" ExportFunctions="True">Functions\Tenancy\Tenants\Get-NetboxTenant.ps1</File>
     <File Build="0" Shared="True" ReferenceFunction="Invoke-Get-NetboxVirtualMachine_ps1" ExportFunctions="True">Functions\Virtualization\VirtualMachine\Get-NetboxVirtualMachine.ps1</File>
     <File Build="0" Shared="True" ReferenceFunction="Invoke-New-NetboxVirtualMachine_ps1" ExportFunctions="True">Functions\Virtualization\VirtualMachine\New-NetboxVirtualMachine.ps1</File>
     <File Build="0" Shared="True" ReferenceFunction="Invoke-Set-NetboxVirtualMachine_ps1" ExportFunctions="True">Functions\Virtualization\VirtualMachine\Set-NetboxVirtualMachine.ps1</File>
@@ -114,6 +120,15 @@
     <File Build="0" Shared="True" ReferenceFunction="Invoke-Set-NetboxTimeout_ps1" ExportFunctions="True">Functions\Setup\Set-NetboxTimeout.ps1</File>
     <File Build="0" Shared="True" ReferenceFunction="Invoke-Get-NetboxTimeout_ps1" ExportFunctions="True">Functions\Setup\Get-NetboxTimeout.ps1</File>
     <File Build="0" Shared="True" ReferenceFunction="Invoke-Get-NetboxVersion_ps1" ExportFunctions="True">Functions\Setup\Get-NetboxVersion.ps1</File>
+    <File Build="0" Shared="True" ReferenceFunction="Invoke-Get-NetboxContact_ps1" ExportFunctions="True">Functions\Tenancy\Contacts\Get-NetboxContact.ps1</File>
+    <File Build="0" Shared="True" ReferenceFunction="Invoke-New-NetboxContact_ps1" ExportFunctions="True">Functions\Tenancy\Contacts\New-NetboxContact.ps1</File>
+    <File Build="0" Shared="True" ReferenceFunction="Invoke-Get-NetboxContactRole_ps1" ExportFunctions="True">Functions\Tenancy\ContactRoles\Get-NetboxContactRole.ps1</File>
+    <File Build="0" Shared="True" ReferenceFunction="Invoke-New-NetboxContactRole_ps1" ExportFunctions="True">Functions\Tenancy\ContactRoles\New-NetboxContactRole.ps1</File>
+    <File Build="0" Shared="True" ReferenceFunction="Invoke-New-NetboxTenant_ps1" ExportFunctions="True">Functions\Tenancy\Tenants\New-NetboxTenant.ps1</File>
+    <File Build="0" Shared="True" ReferenceFunction="Invoke-Get-NetboxContactAssignment_ps1" ExportFunctions="True">Functions\Tenancy\ContactAssignment\Get-NetboxContactAssignment.ps1</File>
+    <File Build="2" Shared="True" ReferenceFunction="Invoke-Get-NetboxContentType_ps1" ExportFunctions="False">Functions\Setup\Support\Get-NetboxContentType.ps1</File>
+    <File Build="2" Shared="True" ReferenceFunction="Invoke-Initialize-NetboxContentTypeEnum_ps1" ExportFunctions="False">Functions\Setup\Support\Initialize-NetboxContentTypeEnum.ps1</File>
+    <File Build="0" Shared="True" ReferenceFunction="Invoke-New-NetboxContactAssignment_ps1" ExportFunctions="True">Functions\Tenancy\ContactAssignment\New-NetboxContactAssignment.ps1</File>
   </Files>
   <StartupScript>R:\Netbox\NetboxPS\Test-Module.ps1</StartupScript>
 </Project>
\ No newline at end of file
diff --git a/deploy.ps1 b/deploy.ps1
index b79da4f..c272fd9 100644
--- a/deploy.ps1
+++ b/deploy.ps1
@@ -157,7 +157,5 @@ if ($ResetCurrentEnvironment) {
     Write-Warning "Running commands to reset current environment"
     Write-Host " Reimporting module"
     Import-Module $PSM1OutputPath, $PSD1OutputPath -Force -ErrorAction Stop
-    Write-Host " Connecting to VivantioAPI"
-    Connect-VivantioAPI -Credential $VivantioAPICredential -ODataURI 'https://neonet.vivantio.com/odata/' -RPCURI 'https://webservices-na01.vivantio.com/api/' -ErrorAction Stop
     Write-Host "Reset complete" -ForegroundColor Green
 }