diff --git a/Source/Applications/SystemCenter/AppDebug.config b/Source/Applications/SystemCenter/AppDebug.config
index a631b9982..d95bc28b2 100644
--- a/Source/Applications/SystemCenter/AppDebug.config
+++ b/Source/Applications/SystemCenter/AppDebug.config
@@ -1,184 +1,184 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-    <section name="categorizedSettings" type="GSF.Configuration.CategorizedSettingsSection, GSF.Core" />
-  </configSections>
-  <categorizedSettings>
-    <systemSettings>
-      <!-- *** MODIFY CONNECTION STRING AND DATA PROVIDER STRINGS BELOW *** -->
-      <add name="ConnectionString" value="Data Source=localhost; Initial Catalog=openXDA; Integrated Security=SSPI" description="Defines the connection to the openXDA database." encrypted="false" />
-      <add name="DataProviderString" value="AssemblyName={System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089}; ConnectionType=System.Data.SqlClient.SqlConnection; AdapterType=System.Data.SqlClient.SqlDataAdapter" description="Configuration database ADO.NET data provider assembly type creation string used when ConfigurationType=Database" encrypted="false" />
-      <!-- **************************************************************** -->
-      <add name="NodeID" value="00000000-0000-0000-0000-000000000000" description="Unique Node ID" encrypted="false" />
-      <!-- *** DEBUG OPTIONS - CHANGE FOR PRODUCTION DEPLOYMENT *** -->
-      <add name="WebHostURL" value="http://localhost:8987" description="The web hosting URL for remote system management." encrypted="false" />
-      <add name="WebRootPath" value="..\..\..\..\Source\Applications\SystemCenter\wwwroot" description="The root path for the hosted web server files. Location will be relative to install folder if full path is not specified." encrypted="false" />
-      <add name="TemplatePath" value="Eval(systemSettings.WebRootPath)" description="Path for data context based razor field templates." encrypted="false" />
-      <add name="EmbeddedTemplatePath" value="GSF.Web.Model.Views." description="Embedded name space path for data context based razor field templates." encrypted="false" />
-      <add name="ClientCacheEnabled" value="true" description="Determines if cache control is enabled for browser clients." encrypted="false" />
-      <add name="DefaultWebPage" value="index.cshtml" description="The default web page for the hosted web server." encrypted="false" />
-      <add name="CompanyName" value="Grid Protection Alliance" description="The name of the company who owns this instance of the SystemCenter." encrypted="false" />
-      <add name="CompanyAcronym" value="TVA" description="The acronym representing the company who owns this instance of the SystemCenter." encrypted="false" />
-      <add name="DefaultCulture" value="en-US" description="Default culture to use for language, country/region and calendar formats." encrypted="false" />
-      <add name="DateFormat" value="MM/dd/yyyy" description="The date format to use when rendering timestamps." encrypted="false" />
-      <add name="TimeFormat" value="HH:mm.ss.fff" description="The time format to use when rendering timestamps." encrypted="false" />
-      <add name="BootstrapTheme" value="Content/bootstrap-theme.min.css" description="Path to Bootstrap CSS to use for rendering styles." encrypted="false" />
-      <add name="AllowedDomainList" value="*" description="Cross-domain access. Can have 1 domain or all domains. Use * for all domains and wildcards, e.g., *.consoto.com." encrypted="false"/>
-      <add name="AuthenticationSchemes" value="Ntlm, Basic" description="Comma separated list of authentication schemes to use for clients accessing the hosted web server, e.g., Basic or NTLM." encrypted="false" />
-      <add name="AuthFailureRedirectResourceExpression" value="^/$|^/.+\.cshtml$|^/.+\.vbhtml$|^/grafana(?!/api/).*$" description="Expression that will match paths for the resources on the web server that should redirect to the LoginPage when authentication fails." encrypted="false" />
-      <add name="AnonymousResourceExpression" value="^/@|^/Scripts/|^/Content/|^/Images/|^/fonts/|^/favicon.ico$|^/api/jsonapi/" description="Expression that will match paths for the resources on the web server that can be provided without checking credentials." encrypted="false" />
-      <add name="AuthenticationToken" value="x-gsf-auth" description="Defines the token used for identifying the authentication token in cookie headers." encrypted="false" />
-      <add name="SessionToken" value="x-gsf-session" description="Defines the token used for identifying the session ID in cookie headers." encrypted="false" />
-      <add name="LoginPage" value="/@GSF/Web/Security/Views/Login.cshtml" description="Defines the login page used for redirects on authentication failure. Expects forward slash prefix." encrypted="false" />
-      <add name="AuthTestPage" value="/AuthTest" description="Defines the page name for the web server to test if a user is authenticated. Expects forward slash prefix." encrypted="false" />
-      <add name="Realm" value="" description="Case-sensitive identifier that defines the protection space for the web based authentication and is used to indicate a scope of protection." encrypted="false" />
-      <add name="SessionTimeout" value="20" description="The timeout, in minutes, for which inactive client sessions will be expired and removed from the cache." encrypted="false" />
-      <add name="SessionMonitorInterval" value="60000" description="The interval, in milliseconds, over which the client session cache will be evaluated for expired sessions." encrypted="false" />
-      <add name="TableNamePrefix" value="SystemCenter." description="Allows for a general prefacing of table names so databases can be consolidated." encrypted="false" />
-      <add name="UserAccountMetaDataUpdater" value="never" description="Cron syntax for running UserAccount MetaData Operation, never if not desired to run" encrypted="false" />
+	<configSections>
+		<section name="categorizedSettings" type="GSF.Configuration.CategorizedSettingsSection, GSF.Core" />
+	</configSections>
+	<categorizedSettings>
+		<systemSettings>
+			<!-- *** MODIFY CONNECTION STRING AND DATA PROVIDER STRINGS BELOW *** -->
+			<add name="ConnectionString" value="Data Source=localhost\MSSQLSERVER01;Initial Catalog=openXDA; Integrated Security=SSPI; Trusted_Connection=True;TrustServerCertificate=True;" description="Defines the connection to the openXDA database." encrypted="false" />
+			<add name="DataProviderString" value="AssemblyName={System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089}; ConnectionType=System.Data.SqlClient.SqlConnection; AdapterType=System.Data.SqlClient.SqlDataAdapter" description="Configuration database ADO.NET data provider assembly type creation string used when ConfigurationType=Database" encrypted="false" />
+			<!-- **************************************************************** -->
+			<add name="NodeID" value="00000000-0000-0000-0000-000000000000" description="Unique Node ID" encrypted="false" />
+			<!-- *** DEBUG OPTIONS - CHANGE FOR PRODUCTION DEPLOYMENT *** -->
+			<add name="WebHostURL" value="http://localhost:8988" description="The web hosting URL for remote system management." encrypted="false" />
+			<add name="WebRootPath" value="..\..\..\..\Source\Applications\SystemCenter\wwwroot" description="The root path for the hosted web server files. Location will be relative to install folder if full path is not specified." encrypted="false" />
+			<add name="TemplatePath" value="Eval(systemSettings.WebRootPath)" description="Path for data context based razor field templates." encrypted="false" />
+			<add name="EmbeddedTemplatePath" value="GSF.Web.Model.Views." description="Embedded name space path for data context based razor field templates." encrypted="false" />
+			<add name="ClientCacheEnabled" value="true" description="Determines if cache control is enabled for browser clients." encrypted="false" />
+			<add name="DefaultWebPage" value="index.cshtml" description="The default web page for the hosted web server." encrypted="false" />
+			<add name="CompanyName" value="Grid Protection Alliance" description="The name of the company who owns this instance of the SystemCenter." encrypted="false" />
+			<add name="CompanyAcronym" value="TVA" description="The acronym representing the company who owns this instance of the SystemCenter." encrypted="false" />
+			<add name="DefaultCulture" value="en-US" description="Default culture to use for language, country/region and calendar formats." encrypted="false" />
+			<add name="DateFormat" value="MM/dd/yyyy" description="The date format to use when rendering timestamps." encrypted="false" />
+			<add name="TimeFormat" value="HH:mm.ss.fff" description="The time format to use when rendering timestamps." encrypted="false" />
+			<add name="BootstrapTheme" value="Content/bootstrap-theme.min.css" description="Path to Bootstrap CSS to use for rendering styles." encrypted="false" />
+			<add name="AllowedDomainList" value="*" description="Cross-domain access. Can have 1 domain or all domains. Use * for all domains and wildcards, e.g., *.consoto.com." encrypted="false"/>
+			<add name="AuthenticationSchemes" value="Ntlm, Basic" description="Comma separated list of authentication schemes to use for clients accessing the hosted web server, e.g., Basic or NTLM." encrypted="false" />
+			<add name="AuthFailureRedirectResourceExpression" value="^/$|^/.+\.cshtml$|^/.+\.vbhtml$|^/grafana(?!/api/).*$" description="Expression that will match paths for the resources on the web server that should redirect to the LoginPage when authentication fails." encrypted="false" />
+			<add name="AnonymousResourceExpression" value="^/@|^/Scripts/|^/Content/|^/Images/|^/fonts/|^/favicon.ico$|^/api/jsonapi/" description="Expression that will match paths for the resources on the web server that can be provided without checking credentials." encrypted="false" />
+			<add name="AuthenticationToken" value="x-gsf-auth" description="Defines the token used for identifying the authentication token in cookie headers." encrypted="false" />
+			<add name="SessionToken" value="x-gsf-session" description="Defines the token used for identifying the session ID in cookie headers." encrypted="false" />
+			<add name="LoginPage" value="/@GSF/Web/Security/Views/Login.cshtml" description="Defines the login page used for redirects on authentication failure. Expects forward slash prefix." encrypted="false" />
+			<add name="AuthTestPage" value="/AuthTest" description="Defines the page name for the web server to test if a user is authenticated. Expects forward slash prefix." encrypted="false" />
+			<add name="Realm" value="" description="Case-sensitive identifier that defines the protection space for the web based authentication and is used to indicate a scope of protection." encrypted="false" />
+			<add name="SessionTimeout" value="20" description="The timeout, in minutes, for which inactive client sessions will be expired and removed from the cache." encrypted="false" />
+			<add name="SessionMonitorInterval" value="60000" description="The interval, in milliseconds, over which the client session cache will be evaluated for expired sessions." encrypted="false" />
+			<add name="TableNamePrefix" value="SystemCenter." description="Allows for a general prefacing of table names so databases can be consolidated." encrypted="false" />
+			<add name="UserAccountMetaDataUpdater" value="never" description="Cron syntax for running UserAccount MetaData Operation, never if not desired to run" encrypted="false" />
 
-    </systemSettings>
-    <dbFawg>
-      <add name="ConnectionString" value="Data Source=vmhostsql; Initial Catalog=Demo_FAWG; Integrated Security=SSPI"
-        description="Defines the connection to the openXDA database."
-        encrypted="false" />
-      <add name="DataProviderString" value="AssemblyName={System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089}; ConnectionType=System.Data.SqlClient.SqlConnection; AdapterType=System.Data.SqlClient.SqlDataAdapter"
-        description="Configuration database ADO.NET data provider assembly type creation string used when ConfigurationType=Database"
-        encrypted="false" />
-    </dbFawg>
-    <securityProvider>
-      <add name="ApplicationName" value="SystemCenter" description="Name of the application being secured as defined in the backend security datastore." encrypted="false" />
-      <add name="ConnectionString" value="Eval(systemSettings.ConnectionString)" description="Connection connection string to be used for connection to the backend security datastore." encrypted="false" />
-      <add name="DataProviderString" value="Eval(systemSettings.DataProviderString)" description="Configuration database ADO.NET data provider assembly type creation string to be used for connection to the backend security datastore." encrypted="false" />
-	  <add name="ProviderType" value="GSF.Security.AdoSecurityProvider, GSF.Security" description="The type to be used for enforcing security." encrypted="false" />
-      <add name="UserCacheTimeout" value="0" description="Defines the timeout, in whole minutes, for a user's provider cache. Any value less than 1 will cause cache reset every minute." encrypted="false" />
-      <add name="IncludedResources" value="UpdateSettings,UpdateConfigFile=Special; Settings,Schedules,Help,Status,Version,Time,User,Health,List,Invoke,ListCommands,ListReports,GetReport=*; Processes,Start,ReloadCryptoCache,ReloadSettings,Reschedule,Unschedule,SaveSchedules,LoadSchedules,ResetHealthMonitor,Connect,Disconnect,Initialize,ReloadConfig,Authenticate,RefreshRoutes,TemporalSupport,LogEvent,GenerateReport,ReportingConfig=Administrator,Editor; *=Administrator" description="Semicolon delimited list of resources to be secured along with role names." encrypted="false" />
-      <add name="ExcludedResources" value="" description="Semicolon delimited list of resources to be excluded from being secured." encrypted="false" />
-      <add name="NotificationSmtpServer" value="localhost" description="SMTP server to be used for sending out email notification messages." encrypted="false" />
-      <add name="NotificationSenderEmail" value="sender@company.com" description="Email address of the sender of email notification messages." encrypted="false" />
-      <add name="LdapPath" value="" description="Specifies the LDAP path used to initialize the security provider." encrypted="false" />
-      <add name="CacheRetryDelayInterval" value="1000" description="Wait interval, in milliseconds, before retrying load of user data cache." encrypted="false" />
-      <add name="CacheMaximumRetryAttempts" value="5" description="Maximum retry attempts allowed for loading user data cache." encrypted="false" />
-      <add name="EnableOfflineCaching" value="True" description="True to enable caching of user information for authentication in offline state, otherwise False." encrypted="false" />
-      <add name="PasswordRequirementsRegex" value="^.*(?=.{8,})(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).*$" description="Regular expression used to validate new passwords for database users." encrypted="false" />
-      <add name="PasswordRequirementsError" value="Invalid Password: Password must be at least 8 characters; must contain at least 1 number, 1 upper case letter, and 1 lower case letter" description="Error message to be displayed when new database user password fails regular expression test." encrypted="false" />
-      <add name="AzureADConfigSource" value="appsettings.json" description="Azure AD configuration source. Either 'appsettings.json' file path or settings category to use." encrypted="false" />
-      <add name="AzureADSecret" value="env(User:SystemCenterSecretKey)" description="Defines the Azure AD secret value to be used for user info and group lookups, post authentication." encrypted="false" />
-    </securityProvider>
-    <remotingServer>
-      <add name="ConfigurationString" value="Port=8429" description="Data required by the server to initialize." encrypted="false"/>
-      <add name="MaxClientConnections" value="-1" description="Maximum number of clients that can connect to the server." encrypted="false"/>
-      <add name="SendBufferSize" value="8192" description="Size of the buffer used by the server for sending data to the clients." encrypted="false"/>
-      <add name="ReceiveBufferSize" value="8192" description="Size of the buffer used by the server for receiving data from the clients." encrypted="false"/>
-      <add name="EnabledSslProtocols" value="Tls12" description="The set of SSL protocols that are enabled for this server." encrypted="false"/>
-      <add name="RequireClientCertificate" value="False" description="True if the client certificate is required during authentication, otherwise False." encrypted="false"/>
-      <add name="CheckCertificateRevocation" value="False" description="True if the certificate revocation list is to be checked during authentication, otherwise False." encrypted="false"/>
-      <add name="CertificateFile" value="Eval(systemSettings.LocalCertificate)" description="Path to the local certificate used by this server for authentication." encrypted="false" />
-      <add name="TrustedCertificatesPath" value="" description="Path to the directory containing the trusted remote certificates." encrypted="false"/>
-      <add name="ValidPolicyErrors" value="None" description="Set of valid policy errors when validating remote certificates." encrypted="false"/>
-      <add name="ValidChainFlags" value="NoError" description="Set of valid chain flags used when validating remote certificates." encrypted="false"/>
-      <add name="PayloadAware" value="True" description="True if payload boundaries are to be preserved during transmission, otherwise False." encrypted="false"/>
-      <add name="IntegratedSecurity" value="True" description="True if the client Windows account credentials are used for authentication, otherwise False." encrypted="false"/>
-      <add name="AllowDualStackSocket" value="True" description="True if dual-mode socket is allowed when IP address is IPv6, otherwise False." encrypted="false"/>
-      <add name="MaxSendQueueSize" value="-1" description="The maximum size of the send queue before payloads are dumped from the queue." encrypted="false"/>
-    </remotingServer>
-    <errorLogger>
-      <clear />
-      <add name="LogToDatabase" value="false" description="True if an encountered exception is logged to the database; otherwise False."
-        encrypted="false" scope="Application" />
-      <add name="LogToUI" value="False" description="True if an encountered exception is to be logged to the User Interface; otherwise False."
-        encrypted="false" scope="Application" />
-      <add name="LogToFile" value="True" description="True if an encountered exception is to be logged to a file; otherwise False."
-        encrypted="false" scope="Application" />
-      <add name="LogToEmail" value="False" description="True if an email is to be sent to ContactEmail with the details of an encountered exception; otherwise False."
-        encrypted="false" scope="Application" />
-      <add name="LogToEventLog" value="False" description="True if an encountered exception is to be logged to the Event Log; otherwise False."
-        encrypted="false" scope="Application" />
-      <add name="DatabaseLogSize" value="2000" description="Maximum exception log size to maintain when logging exceptions to the database."
-        encrypted="false" scope="Application" />
-      <add name="LogUserInfo" value="False" description="True if user information is to be logged along with exception information; otherwise False."
-        encrypted="false" scope="Application" />
-      <add name="SmtpServer" value="" description="Name of the SMTP server to be used for sending the email messages."
-        encrypted="false" scope="Application" />
-      <add name="ContactName" value="" description="Name of the person that the end-user can contact when an exception is encountered."
-        encrypted="false" scope="Application" />
-      <add name="ContactEmail" value="" description="Comma-separated list of recipient email addresses for the email message."
-        encrypted="false" scope="Application" />
-      <add name="ContactPhone" value="" description="Phone number of the person that the end-user can contact when an exception is encountered."
-        encrypted="false" scope="Application" />
-      <add name="HandleUnhandledException" value="True" description="True if unhandled exceptions are to be handled automatically; otherwise False."
-        encrypted="false" scope="Application" />
-      <add name="ExitOnUnhandledException" value="False" description="True if the application must exit when an unhandled exception is encountered; otherwise False."
-        encrypted="false" scope="Application" />
-    </errorLogger>
-    <dbMaximo>
-      <add name="ConnectionString" value="Data Source=eamdmp; User ID=user; Password=password" description="Defines the connection to the Maximo database." encrypted="false" />
-    </dbMaximo>
-    <dbPQView>
-      <add name="ConnectionString" value="Data Source=localhost; Initial Catalog=openXDASystemCenter; Integrated Security=SSPI" description="Defines the connection to the PQView database." encrypted="false" />
-      <add name="DataProviderString" value="AssemblyName={System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089}; ConnectionType=System.Data.SqlClient.SqlConnection; AdapterType=System.Data.SqlClient.SqlDataAdapter" description="Configuration database ADO.NET data provider assembly type creation string used when ConfigurationType=Database" encrypted="false" />
-    </dbPQView>
+		</systemSettings>
+		<dbFawg>
+			<add name="ConnectionString" value="Data Source=vmhostsql; Initial Catalog=Demo_FAWG; Integrated Security=SSPI"
+			  description="Defines the connection to the openXDA database."
+			  encrypted="false" />
+			<add name="DataProviderString" value="AssemblyName={System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089}; ConnectionType=System.Data.SqlClient.SqlConnection; AdapterType=System.Data.SqlClient.SqlDataAdapter"
+			  description="Configuration database ADO.NET data provider assembly type creation string used when ConfigurationType=Database"
+			  encrypted="false" />
+		</dbFawg>
+		<securityProvider>
+			<add name="ApplicationName" value="SystemCenter" description="Name of the application being secured as defined in the backend security datastore." encrypted="false" />
+			<add name="ConnectionString" value="Eval(systemSettings.ConnectionString)" description="Connection connection string to be used for connection to the backend security datastore." encrypted="false" />
+			<add name="DataProviderString" value="Eval(systemSettings.DataProviderString)" description="Configuration database ADO.NET data provider assembly type creation string to be used for connection to the backend security datastore." encrypted="false" />
+			<add name="ProviderType" value="GSF.Security.AdoSecurityProvider, GSF.Security" description="The type to be used for enforcing security." encrypted="false" />
+			<add name="UserCacheTimeout" value="0" description="Defines the timeout, in whole minutes, for a user's provider cache. Any value less than 1 will cause cache reset every minute." encrypted="false" />
+			<add name="IncludedResources" value="UpdateSettings,UpdateConfigFile=Special; Settings,Schedules,Help,Status,Version,Time,User,Health,List,Invoke,ListCommands,ListReports,GetReport=*; Processes,Start,ReloadCryptoCache,ReloadSettings,Reschedule,Unschedule,SaveSchedules,LoadSchedules,ResetHealthMonitor,Connect,Disconnect,Initialize,ReloadConfig,Authenticate,RefreshRoutes,TemporalSupport,LogEvent,GenerateReport,ReportingConfig=Administrator,Editor; *=Administrator" description="Semicolon delimited list of resources to be secured along with role names." encrypted="false" />
+			<add name="ExcludedResources" value="" description="Semicolon delimited list of resources to be excluded from being secured." encrypted="false" />
+			<add name="NotificationSmtpServer" value="localhost" description="SMTP server to be used for sending out email notification messages." encrypted="false" />
+			<add name="NotificationSenderEmail" value="sender@company.com" description="Email address of the sender of email notification messages." encrypted="false" />
+			<add name="LdapPath" value="" description="Specifies the LDAP path used to initialize the security provider." encrypted="false" />
+			<add name="CacheRetryDelayInterval" value="1000" description="Wait interval, in milliseconds, before retrying load of user data cache." encrypted="false" />
+			<add name="CacheMaximumRetryAttempts" value="5" description="Maximum retry attempts allowed for loading user data cache." encrypted="false" />
+			<add name="EnableOfflineCaching" value="True" description="True to enable caching of user information for authentication in offline state, otherwise False." encrypted="false" />
+			<add name="PasswordRequirementsRegex" value="^.*(?=.{8,})(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).*$" description="Regular expression used to validate new passwords for database users." encrypted="false" />
+			<add name="PasswordRequirementsError" value="Invalid Password: Password must be at least 8 characters; must contain at least 1 number, 1 upper case letter, and 1 lower case letter" description="Error message to be displayed when new database user password fails regular expression test." encrypted="false" />
+			<add name="AzureADConfigSource" value="appsettings.json" description="Azure AD configuration source. Either 'appsettings.json' file path or settings category to use." encrypted="false" />
+			<add name="AzureADSecret" value="env(User:SystemCenterSecretKey)" description="Defines the Azure AD secret value to be used for user info and group lookups, post authentication." encrypted="false" />
+		</securityProvider>
+		<remotingServer>
+			<add name="ConfigurationString" value="Port=8429" description="Data required by the server to initialize." encrypted="false"/>
+			<add name="MaxClientConnections" value="-1" description="Maximum number of clients that can connect to the server." encrypted="false"/>
+			<add name="SendBufferSize" value="8192" description="Size of the buffer used by the server for sending data to the clients." encrypted="false"/>
+			<add name="ReceiveBufferSize" value="8192" description="Size of the buffer used by the server for receiving data from the clients." encrypted="false"/>
+			<add name="EnabledSslProtocols" value="Tls12" description="The set of SSL protocols that are enabled for this server." encrypted="false"/>
+			<add name="RequireClientCertificate" value="False" description="True if the client certificate is required during authentication, otherwise False." encrypted="false"/>
+			<add name="CheckCertificateRevocation" value="False" description="True if the certificate revocation list is to be checked during authentication, otherwise False." encrypted="false"/>
+			<add name="CertificateFile" value="Eval(systemSettings.LocalCertificate)" description="Path to the local certificate used by this server for authentication." encrypted="false" />
+			<add name="TrustedCertificatesPath" value="" description="Path to the directory containing the trusted remote certificates." encrypted="false"/>
+			<add name="ValidPolicyErrors" value="None" description="Set of valid policy errors when validating remote certificates." encrypted="false"/>
+			<add name="ValidChainFlags" value="NoError" description="Set of valid chain flags used when validating remote certificates." encrypted="false"/>
+			<add name="PayloadAware" value="True" description="True if payload boundaries are to be preserved during transmission, otherwise False." encrypted="false"/>
+			<add name="IntegratedSecurity" value="True" description="True if the client Windows account credentials are used for authentication, otherwise False." encrypted="false"/>
+			<add name="AllowDualStackSocket" value="True" description="True if dual-mode socket is allowed when IP address is IPv6, otherwise False." encrypted="false"/>
+			<add name="MaxSendQueueSize" value="-1" description="The maximum size of the send queue before payloads are dumped from the queue." encrypted="false"/>
+		</remotingServer>
+		<errorLogger>
+			<clear />
+			<add name="LogToDatabase" value="false" description="True if an encountered exception is logged to the database; otherwise False."
+			  encrypted="false" scope="Application" />
+			<add name="LogToUI" value="False" description="True if an encountered exception is to be logged to the User Interface; otherwise False."
+			  encrypted="false" scope="Application" />
+			<add name="LogToFile" value="True" description="True if an encountered exception is to be logged to a file; otherwise False."
+			  encrypted="false" scope="Application" />
+			<add name="LogToEmail" value="False" description="True if an email is to be sent to ContactEmail with the details of an encountered exception; otherwise False."
+			  encrypted="false" scope="Application" />
+			<add name="LogToEventLog" value="False" description="True if an encountered exception is to be logged to the Event Log; otherwise False."
+			  encrypted="false" scope="Application" />
+			<add name="DatabaseLogSize" value="2000" description="Maximum exception log size to maintain when logging exceptions to the database."
+			  encrypted="false" scope="Application" />
+			<add name="LogUserInfo" value="False" description="True if user information is to be logged along with exception information; otherwise False."
+			  encrypted="false" scope="Application" />
+			<add name="SmtpServer" value="" description="Name of the SMTP server to be used for sending the email messages."
+			  encrypted="false" scope="Application" />
+			<add name="ContactName" value="" description="Name of the person that the end-user can contact when an exception is encountered."
+			  encrypted="false" scope="Application" />
+			<add name="ContactEmail" value="" description="Comma-separated list of recipient email addresses for the email message."
+			  encrypted="false" scope="Application" />
+			<add name="ContactPhone" value="" description="Phone number of the person that the end-user can contact when an exception is encountered."
+			  encrypted="false" scope="Application" />
+			<add name="HandleUnhandledException" value="True" description="True if unhandled exceptions are to be handled automatically; otherwise False."
+			  encrypted="false" scope="Application" />
+			<add name="ExitOnUnhandledException" value="False" description="True if the application must exit when an unhandled exception is encountered; otherwise False."
+			  encrypted="false" scope="Application" />
+		</errorLogger>
+		<dbMaximo>
+			<add name="ConnectionString" value="Data Source=eamdmp; User ID=user; Password=password" description="Defines the connection to the Maximo database." encrypted="false" />
+		</dbMaximo>
+		<dbPQView>
+			<add name="ConnectionString" value="Data Source=localhost; Initial Catalog=openXDASystemCenter; Integrated Security=SSPI" description="Defines the connection to the PQView database." encrypted="false" />
+			<add name="DataProviderString" value="AssemblyName={System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089}; ConnectionType=System.Data.SqlClient.SqlConnection; AdapterType=System.Data.SqlClient.SqlDataAdapter" description="Configuration database ADO.NET data provider assembly type creation string used when ConfigurationType=Database" encrypted="false" />
+		</dbPQView>
 
-  </categorizedSettings>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-  </startup>
-  <runtime>
-    <gcServer enabled="true" />
-    <gcConcurrent enabled="true" />
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.49.1.0" newVersion="4.49.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" 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.6" newVersion="6.0.0.6" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
-      </dependentAssembly>
-      <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="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.23.1.0" newVersion="6.23.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+	</categorizedSettings>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+	</startup>
+	<runtime>
+		<gcServer enabled="true" />
+		<gcConcurrent enabled="true" />
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.49.1.0" newVersion="4.49.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" 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.6" newVersion="6.0.0.6" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+			</dependentAssembly>
+			<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="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.23.1.0" newVersion="6.23.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
 </configuration>
diff --git a/Source/Applications/SystemCenter/SystemCenter.csproj b/Source/Applications/SystemCenter/SystemCenter.csproj
index 25979961b..27de5f394 100644
--- a/Source/Applications/SystemCenter/SystemCenter.csproj
+++ b/Source/Applications/SystemCenter/SystemCenter.csproj
@@ -617,9 +617,12 @@
     <Content Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\GenericByPage.tsx" />
     <Content Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\Restrictions\EditionLockPage.tsx" />
     <Content Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\Restrictions\EditionLockModal.tsx" />
-    <TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\AssetGroupWindow.tsx" />
+    <TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\ControllerSelectPopup.tsx" />
     <TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\ExtDBTaskStatusModal.tsx" />
     <TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\FileGroupAnalysisJobPriority.tsx" />
+    <TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\GenericInfo.tsx" />
+    <TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\GenericRecord.tsx" />
+    <TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\GenericRelation.tsx" />
     <TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\ProcessingStatus.tsx" />
     <TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\Restrictions\EditionRestrictionTooltip.tsx" />
     <TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\Restrictions\RoleRestrictionTooltip.tsx" />
@@ -873,7 +876,7 @@
           </CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
           <servers defaultServer="SelfHostServer">
-            <server name="SelfHostServer" exePath="" cmdArgs="" url="http://localhost:8987/" workingDir="" />
+            <server name="SelfHostServer" exePath="" cmdArgs="" url="http://localhost:8988/" workingDir="" />
           </servers>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/Source/Applications/SystemCenter/package-lock.json b/Source/Applications/SystemCenter/package-lock.json
index 8c3506eb4..c06a921f4 100644
--- a/Source/Applications/SystemCenter/package-lock.json
+++ b/Source/Applications/SystemCenter/package-lock.json
@@ -9,8 +9,8 @@
       "version": "0.0.1",
       "dependencies": {
         "@arcgis/core": "5.1.17",
-        "@gpa-gemstone/common-pages": "0.0.190",
-        "@gpa-gemstone/react-graph": "1.0.115",
+        "@gpa-gemstone/common-pages": "0.0.191",
+        "@gpa-gemstone/react-graph": "1.0.116",
         "@reduxjs/toolkit": "1.8.3",
         "@turf/turf": "7.4.0",
         "assert": "2.0.0",
@@ -1364,17 +1364,17 @@
       }
     },
     "node_modules/@gpa-gemstone/common-pages": {
-      "version": "0.0.190",
-      "resolved": "https://registry.npmjs.org/@gpa-gemstone/common-pages/-/common-pages-0.0.190.tgz",
-      "integrity": "sha512-rZqtPdyKp8cjEQHvBdEd1ll0scVjy2ldJQ7Sfof0/kZ9l4pbsIw+Fh5N5Kdv0ds8mlV0qKePMV/wrwnwj29THQ==",
+      "version": "0.0.191",
+      "resolved": "https://registry.npmjs.org/@gpa-gemstone/common-pages/-/common-pages-0.0.191.tgz",
+      "integrity": "sha512-degtKkDWQXVTospmoU2rdPo3Dk/Fq3U3Yz8s6dGXObPhigAbE9R/Zj0CctiI0Al7Uw9wNNER/PBqVOGZjGcvkA==",
       "license": "MIT",
       "dependencies": {
         "@gpa-gemstone/application-typings": "0.0.99",
         "@gpa-gemstone/gpa-symbols": "0.0.65",
-        "@gpa-gemstone/helper-functions": "0.0.61",
-        "@gpa-gemstone/react-forms": "1.1.127",
-        "@gpa-gemstone/react-interactive": "1.0.195",
-        "@gpa-gemstone/react-table": "1.2.120",
+        "@gpa-gemstone/helper-functions": "0.0.62",
+        "@gpa-gemstone/react-forms": "1.1.128",
+        "@gpa-gemstone/react-interactive": "1.0.196",
+        "@gpa-gemstone/react-table": "1.2.121",
         "@reduxjs/toolkit": "1.8.3",
         "crypto-js": "^4.2.0",
         "moment": "^2.29.4",
@@ -1406,9 +1406,9 @@
       }
     },
     "node_modules/@gpa-gemstone/helper-functions": {
-      "version": "0.0.61",
-      "resolved": "https://registry.npmjs.org/@gpa-gemstone/helper-functions/-/helper-functions-0.0.61.tgz",
-      "integrity": "sha512-WA1o0V/aK/yN70Ly4iAD0T2ubAu1yWNDRMngp4YBoLgYgwD9wDXzCk1oG9xH+pAqZ4XAlLmZior8OhjSDpvt/g==",
+      "version": "0.0.62",
+      "resolved": "https://registry.npmjs.org/@gpa-gemstone/helper-functions/-/helper-functions-0.0.62.tgz",
+      "integrity": "sha512-QydrNqr9ZIfmqfGeJ4YJz21FYRj3Co2l4BKgl/ytyuaTNiudhgdq1uMgJY4X4IHLjT28qDfaEDEH7h1iMQkRDA==",
       "license": "MIT",
       "dependencies": {
         "@gpa-gemstone/application-typings": "0.0.99",
@@ -1419,14 +1419,14 @@
       }
     },
     "node_modules/@gpa-gemstone/react-forms": {
-      "version": "1.1.127",
-      "resolved": "https://registry.npmjs.org/@gpa-gemstone/react-forms/-/react-forms-1.1.127.tgz",
-      "integrity": "sha512-Cb0j3ZBN0LVBZVgomiYWB1rrVFeFAuZVeOrxasNv3rGsB/uWAH4pUg+o8QWvjTvhZD83IHzVS7gudZC/W3GbMw==",
+      "version": "1.1.128",
+      "resolved": "https://registry.npmjs.org/@gpa-gemstone/react-forms/-/react-forms-1.1.128.tgz",
+      "integrity": "sha512-HEqJM9QVQ39rPb+mmZRqz1l3IXeQjYa1zDhUrpGHu5IC+cr9WsPZ92m1WFUD8q0c1Vz5uMIK1Pxt+yIF+/7GHg==",
       "license": "MIT",
       "dependencies": {
         "@gpa-gemstone/application-typings": "0.0.99",
         "@gpa-gemstone/gpa-symbols": "0.0.65",
-        "@gpa-gemstone/helper-functions": "0.0.61",
+        "@gpa-gemstone/helper-functions": "0.0.62",
         "lodash": "^4.17.21",
         "moment": "2.29.4",
         "react-color": "^2.19.3",
@@ -1438,14 +1438,14 @@
       }
     },
     "node_modules/@gpa-gemstone/react-graph": {
-      "version": "1.0.115",
-      "resolved": "https://registry.npmjs.org/@gpa-gemstone/react-graph/-/react-graph-1.0.115.tgz",
-      "integrity": "sha512-7JZqqEyvk+IxKqbQ6cALV9EuD/Pe7jed1WscpdgMR37wJZXB01Z7jMktr7zYsB4WbR7HkonUSBwFBBgYMaa7xw==",
+      "version": "1.0.116",
+      "resolved": "https://registry.npmjs.org/@gpa-gemstone/react-graph/-/react-graph-1.0.116.tgz",
+      "integrity": "sha512-qRrr58jqv/H+cC0EeXbivemczCeCFIGlmFWtpqLvnRLB7yActzw02CS5XU9ZVeo2k9PEctud9n8MDmq8OwN2Zw==",
       "license": "MIT",
       "dependencies": {
         "@gpa-gemstone/gpa-symbols": "0.0.65",
-        "@gpa-gemstone/helper-functions": "0.0.61",
-        "@gpa-gemstone/react-forms": "1.1.127",
+        "@gpa-gemstone/helper-functions": "0.0.62",
+        "@gpa-gemstone/react-forms": "1.1.128",
         "html2canvas": "^1.4.1",
         "lodash": "^4.17.21",
         "moment": "2.29.4"
@@ -1456,15 +1456,15 @@
       }
     },
     "node_modules/@gpa-gemstone/react-interactive": {
-      "version": "1.0.195",
-      "resolved": "https://registry.npmjs.org/@gpa-gemstone/react-interactive/-/react-interactive-1.0.195.tgz",
-      "integrity": "sha512-QMW0EF6OjqMtXFsYZnTimQSAIWMjM5u5OXsuWOFgxQBTl0UkDezdxuDouTOONCqKcx8bwga5FCLP0LCnsjx1Aw==",
+      "version": "1.0.196",
+      "resolved": "https://registry.npmjs.org/@gpa-gemstone/react-interactive/-/react-interactive-1.0.196.tgz",
+      "integrity": "sha512-BUOUMQCcDNNNamET9dCiHcQZ8m3+fdYi2gsU8bPOGE1lN+AGQ5dzwyY9lO8+ju+I50GNr0uofoSsMGFbr0XbxQ==",
       "license": "MIT",
       "dependencies": {
         "@gpa-gemstone/application-typings": "0.0.99",
         "@gpa-gemstone/gpa-symbols": "0.0.65",
-        "@gpa-gemstone/helper-functions": "0.0.61",
-        "@gpa-gemstone/react-forms": "1.1.127",
+        "@gpa-gemstone/helper-functions": "0.0.62",
+        "@gpa-gemstone/react-forms": "1.1.128",
         "@reduxjs/toolkit": "1.8.3",
         "jquery": "^3.6.0",
         "lodash": "^4.17.21",
@@ -1480,14 +1480,14 @@
       }
     },
     "node_modules/@gpa-gemstone/react-table": {
-      "version": "1.2.120",
-      "resolved": "https://registry.npmjs.org/@gpa-gemstone/react-table/-/react-table-1.2.120.tgz",
-      "integrity": "sha512-Gz9GCAPmeZ14NjFdFxUsyZzWJkd6+BvARIth7np2lVVIp/zLqmU+ll0d0K2UpTKOaxQJz9VDD1CUMmRZDz/Zdw==",
+      "version": "1.2.121",
+      "resolved": "https://registry.npmjs.org/@gpa-gemstone/react-table/-/react-table-1.2.121.tgz",
+      "integrity": "sha512-5sI0IoThNp/+t/rOk3qTQe9t7as8fN6e/pgdfr9h/FSihQuszwSXN0QgRS8t+GR5U+hHhveSK3UnLr0V4qHlzA==",
       "license": "MIT",
       "dependencies": {
         "@gpa-gemstone/gpa-symbols": "0.0.65",
-        "@gpa-gemstone/helper-functions": "0.0.61",
-        "@gpa-gemstone/react-interactive": "1.0.195",
+        "@gpa-gemstone/helper-functions": "0.0.62",
+        "@gpa-gemstone/react-interactive": "1.0.196",
         "lodash": "^4.17.21",
         "react-portal": "4.2.2"
       },
diff --git a/Source/Applications/SystemCenter/package.json b/Source/Applications/SystemCenter/package.json
index f17a8fde0..aa9b40f81 100644
--- a/Source/Applications/SystemCenter/package.json
+++ b/Source/Applications/SystemCenter/package.json
@@ -27,11 +27,11 @@
     "webpack-cli": "4.7.2"
   },
   "dependencies": {
-    "@gpa-gemstone/react-graph": "1.0.115",
+    "@gpa-gemstone/react-graph": "1.0.116",
     "@turf/turf": "7.4.0",
     "@arcgis/core": "5.1.17",
     "proj4leaflet": "^1.0.2",
-    "@gpa-gemstone/common-pages": "0.0.190",
+    "@gpa-gemstone/common-pages": "0.0.191",
     "@reduxjs/toolkit": "1.8.3",
     "assert": "2.0.0",
     "buffer": "6.0.3",
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/ControllerSelectPopup.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/ControllerSelectPopup.tsx
index 92d4f34f7..8e1bcefac 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/ControllerSelectPopup.tsx
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/ControllerSelectPopup.tsx
@@ -39,9 +39,9 @@ interface IProps<T extends U> {
     MinSelection?: number,
     children?: React.ReactNode,
     DisableConfirm?: boolean
+    Filters?: Search.IFilter<T>[]
 }
 
-
 export default function ControllerSelectPopup<T extends U>(props: IProps<T>) {
     const [filters, setFilters] = React.useState<Search.IFilter<T>[]>([]);
     const [sortField, setSortField] = React.useState<keyof T>('ID')
@@ -64,8 +64,9 @@ export default function ControllerSelectPopup<T extends U>(props: IProps<T>) {
     }, [props.Selection])
 
     React.useEffect(() => {
-        setFilters([]); // initialize filter list, which should add additional filters
-    }, [])
+        if (props.Filters != null) setFilters(props.Filters)
+        else setFilters([]); // initialize filter list, which should add additional filters
+    }, [props.Filters])
 
     function AddCurrentList() {
         const updatedData = selectedData.concat(data);
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/GenericInfo.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/GenericInfo.tsx
new file mode 100644
index 000000000..50d891778
--- /dev/null
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/GenericInfo.tsx
@@ -0,0 +1,140 @@
+//******************************************************************************************************
+//  GenericInfo.tsx - Gbtc
+//
+//  Copyright © 2026, Grid Protection Alliance.  All Rights Reserved.
+//
+//  Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
+//  the NOTICE file distributed with this work for additional information regarding copyright ownership.
+//  The GPA licenses this file to you under the MIT License (MIT), the "License"; you may not use this
+//  file except in compliance with the License. You may obtain a copy of the License at:
+//
+//      http://opensource.org/licenses/MIT
+//
+//  Unless agreed to in writing, the subject software distributed under the License is distributed on an
+//  "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
+//  License for the specific language governing permissions and limitations.
+//
+//  Code Modification History:
+//  ----------------------------------------------------------------------------------------------------
+//  09/10/2026 - Natalie Beatty
+//       Generated original version of source code.
+//
+//******************************************************************************************************
+
+import * as React from 'react';
+import { ToolTip } from '@gpa-gemstone/react-forms';
+import { ReactIcons } from '@gpa-gemstone/gpa-symbols';
+
+interface IProps<T> {
+    /**
+     * Forms to display within the tab.
+     */
+    Forms: Array<(record: T, setter: React.Dispatch<React.SetStateAction<T>>, setErrors: React.Dispatch<React.SetStateAction<string[]>>) => React.ReactNode>
+    /**
+     * Determine whether the user has permissions to edit the record.
+     */
+    HasPermissions: () => boolean
+    /**
+     * User-facing name for the record type.
+     */
+    RecordType: string
+    /**
+     * Record to edit in the form and send as the new version of the model in a patch.
+     */
+    SelectedRecord: T
+    /**
+     * Setter for the selected record.
+     */
+    SetSelectedRecord: React.Dispatch<React.SetStateAction<T>>
+    /**
+     * List of errors for the selected record.
+     */
+    Errors: string[]
+    /**
+     * Setter for the errors
+     */
+    SetErrors: React.Dispatch<React.SetStateAction<string[]>>
+    /**
+     * List of warnings for the selected record.
+     */
+    Warnings: string[]
+    /**
+     * Callback to set Selected Record back to its original state.
+     */
+    ClearChanges: () => void;
+    /**
+     * Callback to patch the original record to reflect changes made on the selected record.
+     */
+    Patch: () => void;
+}
+
+/**
+ * A generic tab for record of type T for viewing and editing fields of the record.
+ * @param props
+ * @returns
+ */
+function GenericInfo<T,>({
+    Forms,
+    HasPermissions,
+    RecordType,
+    SelectedRecord,
+    SetSelectedRecord,
+    Errors,
+    SetErrors,
+    Warnings,
+    ClearChanges,
+    Patch
+}: React.PropsWithChildren<IProps<T>>) {
+    const [hover, setHover] = React.useState<('None' | 'Clear' | 'Submit')>('None');
+
+    return (
+        <div className="card" style={{ flex: 1, display: 'flex', flexDirection: 'column', overflow: 'hidden' }}>
+            <div className="card-header">
+                <div className="row">
+                    <div className="col">
+                        <h4>{RecordType} Information:</h4>
+                    </div>
+                </div>
+            </div>
+            <div className="card-body" style={{ flex: 1, overflowY: 'auto' }}>
+                {
+                    Forms.map((form) => {
+                        return form(SelectedRecord, SetSelectedRecord, SetErrors)
+                    })
+                }
+            </div>
+            <div className="card-footer">
+                <div className="btn-group mr-2">
+                    <button className={"btn btn-primary" + (Warnings.length == 0 || Errors.length > 0 ? ' disabled' : '')} onClick={() => {
+                        if (Warnings.length > 0 && Errors.length == 0) {
+                           Patch();
+                        }
+                    }}
+                        onMouseEnter={() => setHover('Submit')} onMouseLeave={() => setHover('None')} data-tooltip={"Update"}
+                    >Save Changes</button>
+                </div>
+                <ToolTip Show={hover == 'Submit' && Errors.length > 0} Position={'top'} Target={"Update"}>
+                    {Errors.map((t, i) => <p key={`a_${i}`}><ReactIcons.CrossMark Color="var(--danger)" /> {t}</p>)}
+                </ToolTip>
+                <ToolTip Show={hover == 'Submit' && !HasPermissions()} Position={'top'} Target={"Update"}>
+                    <p>Your role does not have permission. Please contact your Administrator if you believe this to be in error.</p>
+                </ToolTip>
+                <div className="btn-group mr-2">
+                    <button className="btn btn-warning" onClick={() => {
+                        if (Warnings.length > 0) {
+                            ClearChanges();
+                        }
+                    }
+                    } disabled={Warnings.length == 0}
+                        onMouseEnter={() => setHover('Clear')} onMouseLeave={() => setHover('None')} data-tooltip={"Clr"}
+                    >Clear Changes</button>
+                </div>
+                <ToolTip Show={hover == 'Clear' && Warnings.length > 0} Position={'top'} Target={"Clr"}>
+                    {Warnings.map((t, i) => <p key={`a_${i}`}><ReactIcons.Warning Color="var(--warning)" /> {t}</p>)}
+                </ToolTip>
+            </div>
+        </div>
+    );
+}
+
+export default GenericInfo;
\ No newline at end of file
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/GenericRecord.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/GenericRecord.tsx
new file mode 100644
index 000000000..8e201aba3
--- /dev/null
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/GenericRecord.tsx
@@ -0,0 +1,235 @@
+//******************************************************************************************************
+//  GenericModel.tsx - Gbtc
+//
+//  Copyright © 2026, Grid Protection Alliance.  All Rights Reserved.
+//
+//  Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
+//  the NOTICE file distributed with this work for additional information regarding copyright ownership.
+//  The GPA licenses this file to you under the MIT License (MIT), the "License"; you may not use this
+//  file except in compliance with the License. You may obtain a copy of the License at:
+//
+//      http://opensource.org/licenses/MIT
+//
+//  Unless agreed to in writing, the subject software distributed under the License is distributed on an
+//  "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
+//  License for the specific language governing permissions and limitations.
+//
+//  Code Modification History:
+//  ----------------------------------------------------------------------------------------------------
+//  09/09/2026 - Natalie Beatty
+//       Generated original version of source code.
+//
+//******************************************************************************************************
+
+import * as React from 'react';
+import { GenericController, LoadingScreen, ServerErrorIcon, TabSelector, Warning, Modal } from '@gpa-gemstone/react-interactive'
+import { useGetOne } from '../hooks';
+import { Application } from '@gpa-gemstone/application-typings';
+import { IError } from '@gpa-gemstone/common-pages/lib/Gemstone/GenericSlices/ReadOnlyGenericSlice';
+
+declare var homePath: string;
+
+interface Error {
+    Message: string
+}
+
+interface IProps<T> {
+    /**
+     * ID of the record selected by the user.
+     */
+    RecordID: string | number,
+    /**
+     * String representation of the record type for user-facing messages.
+     */
+    RecordType: string,
+    /**
+     * Local storage key for storing the users' tab
+     */
+    TabLocalStorage: string,
+    /**
+     * Default tab to use if no tab is stored in local storage
+     */
+    DefaultTab: string,
+    /**
+     * API path for record patch, delete, or post functions.
+     */
+    ControllerPath: string,
+    /**
+     * Key to sort by default
+     */
+    DefaultSort: keyof T,
+    /**
+     * API path for 
+     */
+    GetOnePath: string,
+    /**
+     * URL to redirect the user to on record delete.
+     */
+    Redirect: string,
+    /**
+     * Function for deriving the user-facing name of this record.
+     * @param record
+     * @returns
+     */
+    GetName: (record: T) => string,
+    /**
+     * List of tabs to render with the record fetched in this component.
+     */
+    Tabs: IRecordTab<T>[],
+    /**
+     * Callback to determine whether or not user has permission to delete record.
+     */
+    HasDeletePermission: () => boolean
+    /**
+     * Callback to determine whether or not user has patch permission for the record.
+     */
+    HasPatchPermission: () => boolean
+    /**
+     * Initial tab to render, overriding locally stored tab.
+     */
+    InitialTab?: string
+}
+
+interface ITab {
+    Label: string,
+    Id: string
+}
+
+interface IErrorMessage {
+    ExceptionMessage: string
+    ExceptionType: string
+}
+
+export interface IRecordTab<T> extends ITab {
+    Content: (record: T, setRecord: React.Dispatch<React.SetStateAction<T>>, patch: () => void, clearChanges: () => void, errors: string[], setErrors: React.Dispatch<React.SetStateAction<string[]>>, warnings: string[]) => React.ReactNode
+}
+
+/**
+ * Generic Record keeps a copy of the database record to pass along to the tabs for user view and interaction.
+ * When changes are made to the record, that should happen in this component, so it can refresh and pass the updated database record into the tabs.
+ * Renders the tabs passed into it.
+ * This should also include other records? Like the AssetAttributes or the AdditionalFields?
+ * @param props
+ * @returns
+ */
+function GenericRecord<T>({
+    RecordID,
+    RecordType,
+    TabLocalStorage,
+    DefaultTab,
+    ControllerPath,
+    DefaultSort,
+    GetOnePath,
+    Redirect,
+    GetName,
+    Tabs,
+    HasDeletePermission,
+    HasPatchPermission,
+    InitialTab
+}: IProps<T>) {
+    const [tab, setTab] = React.useState<string>(() => getTab(TabLocalStorage, DefaultTab, InitialTab));
+    const [showWarning, setShowWarning] = React.useState<boolean>(false);
+    const [refreshCount, refreshData] = React.useState<number>(0);
+    const [selectedRecord, setSelectedRecord] = React.useState<T | null>(null);
+    const { Data: originalRecord, Status: originalRecordStatus } = useGetOne<T>(GetOnePath, RecordID, refreshCount);
+    const [deleteStatus, setDeleteStatus] = React.useState<Application.Types.Status>('idle');
+    const [patchStatus, setPatchStatus] = React.useState<Application.Types.Status>('idle');
+    const [errorMessage, setErrorMessage] = React.useState<string | null>(null);
+    const [errors, setErrors] = React.useState<string[]>([]);
+
+    React.useEffect(() => {
+        setSelectedRecord(originalRecord);
+    }, [originalRecord])
+
+    const warnings: string[] = React.useMemo(() => {
+        const result: string[] = [];
+        if (selectedRecord == null) return
+        Object.keys(selectedRecord).forEach((key) => {
+            if (!(key in (selectedRecord as object))) return
+            const originalValue = originalRecord[key];
+            const warning = `Changes to ${key} will be lost.`;
+            if (originalValue != selectedRecord[key]) result.push(warning);
+        })
+        return result;
+    }, [originalRecord, selectedRecord])
+
+    const setAndSaveTab = React.useCallback((tabID: string) => {
+        const saved = getTab(TabLocalStorage, DefaultTab);
+        if (saved != tabID) sessionStorage.setItem(TabLocalStorage, JSON.stringify(tabID));
+        setTab(tabID);
+    }, [TabLocalStorage, DefaultTab])
+
+    const clearChanges = React.useCallback(() => {
+        setSelectedRecord(originalRecord);
+    }, [originalRecord])
+
+    const patch = React.useCallback(() => {
+        if (!HasPatchPermission()) return
+        setPatchStatus('loading');
+        new GenericController<T>(ControllerPath, DefaultSort).DBAction("PATCH", selectedRecord)
+            .done(() => { setPatchStatus('idle'), refreshData(x => x + 1) })
+            .fail((error) => {
+                setPatchStatus('error');
+                const errorResponse: IErrorMessage = error.responseJSON;
+                setErrorMessage(errorResponse.ExceptionMessage);
+            })
+    }, [ControllerPath, DefaultSort, selectedRecord])
+
+    const card = React.useMemo(() => {
+        if (selectedRecord == null) return null
+        const i = Tabs.findIndex(t => t.Id === tab)
+        if (i < 0) return null
+        return Tabs[i].Content(selectedRecord, setSelectedRecord, patch, clearChanges, errors, setErrors, warnings);
+    }, [tab, Tabs, selectedRecord]);
+
+    function deleteRecord() {
+        if (!HasDeletePermission()) return
+        setDeleteStatus('loading');
+        new GenericController<T>(ControllerPath, DefaultSort).DBAction("DELETE", originalRecord)
+            .done(() => window.location.href = Redirect)
+            .fail((error) => {
+                setDeleteStatus('error');
+                const errorResponse: IErrorMessage = error.responseJSON;
+                setErrorMessage(errorResponse.ExceptionMessage);
+            })
+    }
+
+    if (originalRecordStatus == 'uninitiated' || originalRecordStatus == 'loading')
+        return <LoadingScreen Show={true} />;
+
+    if (originalRecordStatus == 'error')
+        return <ServerErrorIcon Show={true} Label={"Error occured while retrieving record."} />;
+
+    if (originalRecord == null)
+        return null;
+
+    return (
+        <div style={{ width: '100%', height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
+            <div className="row p-2">
+                <div className="col">
+                    <h2>{GetName(originalRecord)}</h2>
+                </div>
+                <div className="col">
+                    <button className={"btn btn-danger pull-right"} hidden={(originalRecord == null) || !HasDeletePermission()} onClick={() => { if (HasDeletePermission()) setShowWarning(true) }}>Delete {RecordType}</button>
+                </div>
+            </div>
+            <hr />
+
+            <TabSelector CurrentTab={tab} SetTab={(t) => setAndSaveTab(t)} Tabs={Tabs} />
+            {card}
+            <Warning Title={'Delete ' + (GetName(originalRecord))} Show={showWarning} Message={`This will permanently delete this ${RecordType}.`} CallBack={(c) => { if (c) deleteRecord(); setShowWarning(false) }} />
+            <Modal Title={deleteStatus === 'error' ? 'Delete Error' : patchStatus === 'error' ? 'Save Error' : 'Error'} CallBack={() => { setErrorMessage(null); setDeleteStatus('idle'); setPatchStatus('idle') }} Show={errorMessage != null} ShowConfirm={false} ShowCancel={false} ShowX={true}>
+                <div><p>{errorMessage}</p></div>
+            </Modal>
+        </div>
+    )
+}
+
+export default GenericRecord;
+
+function getTab(storage: string, defaultTab: string, initialTab?: string): string {
+    if (initialTab != null) return initialTab;
+    const localTab = JSON.parse(sessionStorage.getItem(storage));
+    if (localTab != null) return localTab;
+    return defaultTab;
+}
\ No newline at end of file
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/GenericRelation.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/GenericRelation.tsx
new file mode 100644
index 000000000..af34668da
--- /dev/null
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/CommonComponents/GenericRelation.tsx
@@ -0,0 +1,339 @@
+//******************************************************************************************************
+//  GenericRelation.tsx - Gbtc
+//
+//  Copyright © 2026, Grid Protection Alliance.  All Rights Reserved.
+//
+//  Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
+//  the NOTICE file distributed with this work for additional information regarding copyright ownership.
+//  The GPA licenses this file to you under the MIT License (MIT), the "License"; you may not use this
+//  file except in compliance with the License. You may obtain a copy of the License at:
+//
+//      http://opensource.org/licenses/MIT
+//
+//  Unless agreed to in writing, the subject software distributed under the License is distributed on an
+//  "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
+//  License for the specific language governing permissions and limitations.
+//
+//  Code Modification History:
+//  ----------------------------------------------------------------------------------------------------
+//  09/16/2026 - Natalie Beatty
+//       Generated original version of source code.
+//
+//******************************************************************************************************s
+
+import * as React from 'react';
+import { GenericController, Search, LoadingScreen, ServerErrorIcon, Warning, Modal } from '@gpa-gemstone/react-interactive';
+import { Table, Column, Paging } from '@gpa-gemstone/react-table';
+import { usePagedSearch } from '../hooks';
+import { SystemCenter as SC } from '../global';
+import { ReactIcons } from '@gpa-gemstone/gpa-symbols';
+import { ToolTip } from '@gpa-gemstone/react-forms';
+
+interface U {
+    ID: number | string
+}
+
+interface IProps<T extends U> {
+    /**
+     * User-facing name for the relation, i.e. Customer Asset or Remote XDA Meter 
+     */
+    RecordType: string
+    /**
+     * Controller for relation.
+     */
+    Controller: GenericController<T>
+    /**
+     * Default filters for the table.
+     */
+    Filters?: Search.IFilter<T>[]
+    /**
+     * Default sort field for the table. If not provided, uses the default sort property of the controller.
+     */
+    DefaultSort?: keyof T
+    /**
+     * ParentID for the table.
+     */
+    ParentID?: string | number
+    /**
+     * Relation table's columns, except for the edit and delete columns.
+     */
+    Columns: SC.IByCol<T>[]
+    /**
+     * If provided, will add an edit column to the table, which displays the ReactElement resulting from this function.
+     * 
+     * @param record
+     * @param recordSetter
+     * @param setErrors
+     * @returns
+     */
+    EditForm?: (record: T, recordSetter: (record: T) => void, setErrors: (errors: string[]) => void) => React.ReactElement;
+    /**
+     * Whether or not to include a delete column.
+     */
+    DeleteColumn?: boolean
+    /**
+     * If provided, adds an "Add New" button to the relation, and uses this prop as the callback.
+     * @returns
+     */
+    AddNew?: () => void
+    /**
+     * A callback to push search results up to parent component.
+     * @param results
+     * @returns
+     */
+    SetSearchResults?: (results: T[]) => void
+    /**
+     * Function to use to determine whether or not a user may edit a relation.
+     * @param item
+     * @returns
+     */
+    IsEditable: (item: T) => boolean
+    /**
+     * Function to derive the user-facing name of the relation from the relation's record.
+     * @param record
+     * @returns
+     */
+    GetName: (record: T) => string
+    /**
+     * Refresh trigger for the table.
+     */
+    RefreshCount?: number
+    /**
+     * Blank record containing default values for the form provided in "Edit Form."
+     */
+    BlankRecord: T
+    /**
+     * Determines whether the user has permissions to edit or delete relations
+     */
+    HasPermissions: () => boolean
+}
+
+/**
+ * A tab for a System Center record for a record's relation (of type T) to other records.
+ * Includes a sortable and paged table in the tabbed-card layout, with settings for a button to add new relations,
+ * and also columns that allow for deleting or editing existing relations.
+ * For example, an Asset Group record might have relation tabs for Meters, Assets, and Asset Groups,
+ * each of which would feature a sortable and paged table of records in that group.
+ * If there are special attributes to the relation, or if the user simply wants to edit the records in this context,
+ * we can provide that functionality with the edit column. 
+ * @param props
+ * @returns
+ */
+function GenericRelation<T extends U>({
+    RecordType,
+    Controller,
+    Filters,
+    DefaultSort,
+    Columns,
+    EditForm,
+    DeleteColumn,
+    AddNew,
+    SetSearchResults,
+    IsEditable,
+    GetName,
+    RefreshCount,
+    BlankRecord,
+    ParentID,
+    HasPermissions
+}: IProps<T>) {
+    const [ascending, setAscending] = React.useState<boolean>(Controller.Ascending);
+    const [sortField, setSortField] = React.useState<keyof T>(DefaultSort ?? Controller.DefaultSort);
+    const [page, setPage] = React.useState<number>(0);
+    const [hover, setHover] = React.useState<"" | "submit">("");
+    const [refreshCount, refreshData] = React.useState<number>(0);
+    const [showDelete, setShowDelete] = React.useState<boolean>(false);
+    const [showEdit, setShowEdit] = React.useState<boolean>(false);
+    const [selectedRecord, setSelectedRecord] = React.useState<T | null>(null);
+    const [editRecord, setEditRecord] = React.useState<T>(BlankRecord);
+    const [editRecordErrors, setEditRecordErrors] = React.useState<string[]>([]);
+
+    const { Data: pagedData, Status: pagedStatus, RecordsPerPage: recordsPerPage, TotalPages: totalPages, TotalRecords: totalRecords } = usePagedSearch<T>(Controller, Filters, page, sortField, ascending, ParentID, refreshCount);
+
+    const getContent = React.useCallback((datum: SC.IColDatum<T>, col: SC.IByCol<T>) => {
+        if (col?.Content != null) return col.Content(datum);
+        else if (col.Type === 'boolean') return datum.item[datum.field] ? <ReactIcons.CheckMark Color="var(--success)" /> : <></>
+        else return datum.item[datum.field] ?? <></>
+    }, []);
+
+    // needs to be a use effect?
+    React.useEffect(() => {
+        if (SetSearchResults != null) SetSearchResults(pagedData);
+    }, [pagedData, SetSearchResults])
+
+    // needs to be a use effect?
+    React.useEffect(() => {
+        refreshData(x => x + 1);
+    }, [RefreshCount])
+
+    let cardBody;
+    if (pagedStatus === 'error') {
+        cardBody = <ServerErrorIcon Show={true} Size={40} Label={'A Server Error Occurred. Please Reload the Application.'} />
+    } else if (pagedStatus === 'loading') {
+        cardBody = <LoadingScreen Show={true} />
+    } else {
+        cardBody =
+            <>
+                <div className="row d-flex flex-column" style={{ flex: 1, overflow: 'hidden' }}>
+                    <Table<T>
+                        TableClass="table table-hover"
+                        Data={pagedData}
+                        SortKey={sortField.toString()}
+                        Ascending={ascending}
+                        OnSort={(d) => {
+                            if (d.colKey == 'Edit' || d.colKey == 'Delete') return;
+                            if (d.colKey === sortField)
+                                setAscending(!ascending);
+                            else {
+                                setAscending(true);
+                                setSortField(d.colField);
+                            }
+                        }}
+                        TheadStyle={{ fontSize: 'smaller' }}
+                        RowStyle={{ fontSize: 'smaller' }}
+                        Selected={(item) => false}
+                        KeySelector={(item) => item.ID}
+                    >
+                        {
+                            ...Columns.map(col => (
+                                <Column<T>
+                                    Key={col.Field.toString()}
+                                    AllowSort={col.AllowSort}
+                                    Field={col.Field}
+                                    HeaderStyle={{ width: col?.Width ?? 'auto' }}
+                                    RowStyle={{ width: col?.Width ?? 'auto' }}
+                                    Content={datum => getContent(datum, col)}
+                                >{col.Label}
+                                </Column>
+                            ))
+                    }
+                    {DeleteColumn ?? false ? <Column<T>
+                        Key={'Delete'}
+                        AllowSort={false}
+                        HeaderStyle={{ width: '10%' }}
+                        RowStyle={{ width: '10%' }}
+                        Content={({ item }) => (
+                            (IsEditable != null ? IsEditable(item) : true) ?
+                            <button
+                                    className={"btn btn-delete" + (IsEditable(item) ? '' : ' disabled') + (HasPermissions() ? '' : ' disabled')}
+                                onClick={(e) => {
+                                    if (HasPermissions()) {
+                                        e.preventDefault();
+                                        if (IsEditable(item)) {
+                                            setSelectedRecord(item);
+                                            setShowDelete(true);
+                                        }
+                                    }
+                                }}>
+                                <span><ReactIcons.TrashCan Color="var(--danger)" Size={20} /></span>
+                            </button> : null)
+                        }
+                    > <p></p>
+                    </Column> : null}
+                    {EditForm != null ? <Column<T>
+                        Key={'Edit'}
+                        AllowSort={false}
+                        HeaderStyle={{ width: '10%' }}
+                        RowStyle={{ width: '10%' }}
+                        Content={({ item }) => (IsEditable(item) ?
+                            <button
+                                className={"btn btn-edit" + (IsEditable(item) ? '' : ' disabled') + (HasPermissions() ? '' : ' disabled')}
+                                onClick={(e) => {
+                                    if (HasPermissions()) {
+                                        e.preventDefault();
+                                        if (IsEditable(item)) {
+                                            setSelectedRecord(item);
+                                            setShowEdit(true);
+                                        }
+                                    }
+                                }}>
+                                <span><ReactIcons.Pencil Color="var(--warning)" Size={20} /></span>
+                            </button> : null)
+                        }
+                    > <p></p>
+                    </Column> : null }
+                    </Table>
+                </div>
+                <div className="row">
+                    <div className="col">
+                        <Paging
+                            Current={page + 1}
+                            SetPage={(p) => setPage(p - 1)}
+                            Total={totalPages}
+                        />
+                    </div>
+                </div>
+            </>
+
+        return (
+            <div className="card" style={{ flex: 1, display: 'flex', flexDirection: 'column', overflow: 'hidden' }}>
+                <div className="card-header">
+                    <div className="row">
+                        <div className="col">
+                            <h4>{RecordType}s:</h4>
+                        </div>
+                    </div>
+                    <div className="row">
+                        <div className="col">
+                            <p style={{ marginTop: 2, marginBottom: 2 }}>
+                                {`Displaying ${RecordType}(s) ${totalRecords > 0 ? (recordsPerPage * page + 1) : 0} - ${recordsPerPage * page + pagedData.length} out of ${totalRecords}`}
+                            </p>
+                        </div>
+                    </div>
+
+                </div>
+
+                <div className="card-body" style={{ display: 'flex', flexDirection: 'column', flex: 1, overflow: 'hidden' }}>
+                    {cardBody}
+                </div >
+
+                <div className="card-footer">
+                    {AddNew != null ?
+                        <>
+                            <div className="add-new-meter">
+                                <button
+                                    className={"btn btn-info" + (HasPermissions() ? '' : ' disabled')}
+                                    type="submit" data-tooltip='AddRecord' onMouseEnter={() => setHover('submit')} onMouseLeave={() => setHover('')}
+                                    onClick={(e) => {
+                                        if (HasPermissions()) {
+                                            e.preventDefault();
+                                            AddNew();
+                                        }
+                                    }}>
+                                    Add {RecordType}
+                                </button>
+                            </div>
+                            <ToolTip Show={hover == 'submit' && !HasPermissions()} Position={'top'} Target={"AddRecord"}>
+                                <p>Your role does not have permission. Please contact your Administrator if you believe this to be in error.</p>
+                            </ToolTip>
+                        </>
+                        : null}
+                </div>
+                {DeleteColumn ?? false ?
+                    <Warning Title={"Delete " + (selectedRecord != null ? GetName(selectedRecord) : RecordType)} Show={showDelete} Message={`Are you sure you want to delete the ${RecordType} for ` + (selectedRecord != null ? GetName(selectedRecord) : "this " + RecordType) + "?"}
+                        CallBack={(conf) => {
+                            if (conf) Controller.DBAction('DELETE', selectedRecord).then(() => { refreshData(x => x+1)}); 
+                            setShowDelete(false);
+                        }} /> : null}
+                {EditForm != null ? 
+                    <Modal Show={showEdit} Title={'Edit ' + (selectedRecord != null ? GetName(selectedRecord) : RecordType)}
+                        ShowCancel={true}
+                        CallBack={(conf) => {
+                            if (conf) Controller.DBAction('PATCH', editRecord).then(() => refreshData(x => x + 1));
+                            setShowEdit(false);
+                        }}
+                        DisableConfirm={editRecordErrors.length > 0}
+                        ShowX={true}
+                        Size={"lg"}
+                        ConfirmShowToolTip={editRecordErrors.length > 0}
+                        ConfirmToolTipContent={
+                            editRecordErrors.map((t, i) => <p key={i}> <ReactIcons.CrossMark Color="var(--danger)" /> {t} </p>)
+                        }>
+                        {EditForm(selectedRecord, setEditRecord, setEditRecordErrors)}
+                    </Modal>
+                    : null}
+            </div>
+        )
+    }
+}
+
+export default GenericRelation;
\ No newline at end of file
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteAssetTab.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteAssetTab.tsx
index 99be7ec96..42463862a 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteAssetTab.tsx
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteAssetTab.tsx
@@ -23,51 +23,41 @@
 
 import * as React from 'react';
 import * as _ from 'lodash';
-import { useAppDispatch, useAppSelector } from '../hooks';
-import { Table, Column, Paging } from '@gpa-gemstone/react-table';
-import { Application, OpenXDA, SystemCenter } from '@gpa-gemstone/application-typings';
-import { RemoteXDAAssetSlice, ByAssetSlice } from '../Store/Store';
-import { LoadingScreen, Modal, Search, ServerErrorIcon, Warning, GenericController } from '@gpa-gemstone/react-interactive';
-import { ToolTip } from '@gpa-gemstone/react-forms';
+import { OpenXDA, SystemCenter } from '@gpa-gemstone/application-typings';
+import { Search, GenericController } from '@gpa-gemstone/react-interactive';
 import { ReactIcons } from '@gpa-gemstone/gpa-symbols';
 import { BlankRemoteXDAAsset, RemoteAssetForm } from './RemoteAssetForm';
 import AssetSelect from '../Asset/AssetSelect';
+import GenericRelation from '../CommonComponents/GenericRelation';
+import { SystemCenter as SC } from '../global';
 import { SelectRoles } from '../Store/UserSettings';
+import { useAppSelector } from '../hooks'; 
 
 interface IProps { ID: number }
 
+const RemoteXDAAssetController = new GenericController<OpenXDA.Types.RemoteXDAAsset>(`${homePath}api/OpenXDA/RemoteXDAAsset`, "LocalAssetName", false);
 
-const RemoteAssetTab = (props: IProps) => {
-    // Display Remote Assets Consts
-    const [sortKey, setSortKey] = React.useState<keyof OpenXDA.Types.RemoteXDAAsset>('LocalAssetName');
-    const [ascending, setAscending] = React.useState<boolean>(true);
-    const dispatch = useAppDispatch();
-    const remoteAssetStatus = useAppSelector(RemoteXDAAssetSlice.Status);
-    const [searchResults, setSearchResults] = React.useState<OpenXDA.Types.RemoteXDAAsset[]>([]);
-    const [searchState, setSearchState] = React.useState<Application.Types.Status>('uninitiated');
-
-    const [page, setPage] = React.useState<number>(0);
-    const [totalPages, setTotalPages] = React.useState<number>(0);
-    const [totalRecords, setTotalRecords] = React.useState<number>(0);
-    const [recordsPerPage, setRecordsPerPage] = React.useState<number>(0);
-    const [refreshTrigger, setRefreshTrigger] = React.useState<boolean>(false);
+const Columns: SC.IByCol<OpenXDA.Types.RemoteXDAAsset>[] = [
+    { Field: "LocalAssetName", Label: "Local Name", Type: "string" },
+    { Field: "LocalAssetKey", Label: "Local Key", Type: "string" },
+    { Field: "RemoteAssetName", Label: "Remote Name", Type: "string" },
+    { Field: "RemoteAssetKey", Label: "Remote Key", Type: "string" },
+    { Field: "Obsfucate", Label: "Obfuscated", Type: "string", Content: ({ item }) => item.Obsfucate ? <ReactIcons.CheckMark Color="var(--success)" /> : null },
+    { Field: "Synced", Label: "Synced", Type: "string", Content: ({ item }) => item.Synced ? <ReactIcons.CheckMark Color="var(--success)" /> : null }
+]
 
-    // Edit and Delete Form Consts
-    const [newInstErrors, setNewInstErrors] = React.useState<string[]>([]);
-    const [remoteAsset, setRemoteAsset] = React.useState<OpenXDA.Types.RemoteXDAAsset>(BlankRemoteXDAAsset);
-    const [selectedAsset, setSelectedAsset] = React.useState<OpenXDA.Types.RemoteXDAAsset>(BlankRemoteXDAAsset);
-    const [showEdit, setShowEdit] = React.useState<(boolean)>(false);
-    const [showDelete, setShowDelete] = React.useState<(boolean)>(false);
-
-    // Add New Asset Consts
-    const assetStatus = useAppSelector(ByAssetSlice.Status) as Application.Types.Status;
-    const [assetList, setAssetList] = React.useState<Array<SystemCenter.Types.DetailedAsset>>([]);
-    const [showAddAssets, setShowAddAssets] = React.useState<(boolean)>(false);
+const RemoteAssetTab = (props: IProps) => {
+    const [assetList, setAssetList] = React.useState<SystemCenter.Types.DetailedAsset[]>([]);
+    const [showAddAssets, setShowAddAssets] = React.useState<boolean>(false);
+    const [refreshCount, refreshData] = React.useState<number>(0);
 
     const roles = useAppSelector(SelectRoles);
-    const [hover, setHover] = React.useState<('submit' | 'clear' | 'none')>('none');
+    function hasPermissions(): boolean {
+        if (roles.indexOf('Administrator') < 0)
+            return false;
+        return true;
+    }
 
-    const remoteAssetController = React.useMemo(() => new GenericController<OpenXDA.Types.RemoteXDAAsset>(`${homePath}api/OpenXDA/RemoteXDAAsset`, "LocalAssetName", false), [])
     const filters: Search.IFilter<OpenXDA.Types.RemoteXDAAsset>[] = React.useMemo(() => [{
         FieldName: 'RemoteXDAInstanceID',
         SearchText: props.ID.toString(),
@@ -76,239 +66,22 @@ const RemoteAssetTab = (props: IProps) => {
         IsPivotColumn: false
     }], [props.ID])
 
-    React.useEffect(() => {
-        if (remoteAssetStatus === 'uninitiated' || remoteAssetStatus === 'changed')
-            dispatch(RemoteXDAAssetSlice.Fetch());
-    }, [dispatch, remoteAssetStatus]);
-
-    React.useEffect(() => {
-        setSearchState('loading');
-        const handle = remoteAssetController.PagedSearch(filters, sortKey, ascending, page);
-        handle.done((d) => {
-            setSearchResults(JSON.parse(d.Data as unknown as string));
-            setTotalPages(d.NumberOfPages);
-            setTotalRecords(d.TotalRecords);
-            setRecordsPerPage(d.RecordsPerPage);
-            if (page >= d.NumberOfPages)
-                setPage(Math.max(d.NumberOfPages - 1, 0));
-            setSearchState('idle')
-        })
-        handle.fail(() => setSearchState("error"));
-        return () => {
-            if (handle != null && handle.abort != null) handle.abort();
-        }
-    }, [filters, sortKey, ascending, page, remoteAssetController, refreshTrigger])
-
-    React.useEffect(() => {
-        if (assetStatus === 'uninitiated' || assetStatus === 'changed')
-            dispatch(ByAssetSlice.Fetch());
-    }, [dispatch, assetStatus]);
-
-    function isEditable(item: OpenXDA.Types.RemoteXDAAsset): boolean {
-        return item.RemoteXDAAssetID <= 0;
-    }
-
-    function hasPermissions(): boolean {
-        if (roles.indexOf('Administrator') < 0)
-            return false;
-        return true;
-    }
-
-    let cardBody;
-    if (remoteAssetStatus === 'error') {
-        cardBody = <ServerErrorIcon Show={true} Size={40} Label={'A Server Error Occurred. Please Reload the Application.'} />
-    } else if (remoteAssetStatus === 'loading') {
-        cardBody = <LoadingScreen Show={true} />
-    } else {
-        cardBody =
-            <>
-            <div className="row d-flex flex-column" style={{ flex: 1, overflow: 'hidden' }}>
-            <Table<OpenXDA.Types.RemoteXDAAsset>
-                TableClass="table table-hover"
-                Data={searchResults}
-                SortKey={sortKey}
-                Ascending={ascending}
-                OnSort={(d) => {
-                    if (d.colKey == 'Edit' || d.colKey == 'Delete') return;
-                    if (d.colKey === sortKey)
-                        setAscending(!ascending);
-                    else {
-                        setAscending(true);
-                        setSortKey(d.colField);
-                    }
-                }}
-                TheadStyle={{ fontSize: 'smaller' }}
-                RowStyle={{ fontSize: 'smaller' }}
-                Selected={(item) => false}
-                KeySelector={(item) => item.ID}
-            >
-                <Column<OpenXDA.Types.RemoteXDAAsset>
-                    Key={'LocalAssetName'}
-                    AllowSort={true}
-                    Field={'LocalAssetName'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                > Local Name
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAAsset>
-                    Key={'LocalAssetKey'}
-                    AllowSort={true}
-                    Field={'LocalAssetKey'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                > Local Key
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAAsset>
-                    Key={'RemoteAssetName'}
-                    AllowSort={true}
-                    Field={'RemoteAssetName'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                > Remote Name
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAAsset>
-                    Key={'RemoteAssetKey'}
-                    AllowSort={true}
-                    Field={'RemoteAssetKey'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                > Remote Key
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAAsset>
-                    Key={'Obsfucate'}
-                    AllowSort={true}
-                    Field={'Obsfucate'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                    Content={({ item }) => item.Obsfucate ? <ReactIcons.CheckMark Color="var(--success)" /> : null }
-                > Obfuscated
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAAsset>
-                    Key={'Synced'}
-                    AllowSort={true}
-                    Field={'Synced'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                    Content={({ item }) => item.Synced ? <ReactIcons.CheckMark Color="var(--success)" /> : null}
-                > Synced
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAAsset>
-                    Key={'Edit'}
-                    AllowSort={false}
-                    HeaderStyle={{ width: '10%' }}
-                    RowStyle={{ width: '10%' }}
-                    Content={({ item }) => (isEditable(item) ?
-                        <button
-                            className={"btn btn-edit" + (isEditable(item) ? '' : ' disabled') + (hasPermissions() ? '' : ' disabled')}
-                            onClick={(e) => {
-                                if (hasPermissions()) {
-                                    e.preventDefault();
-                                    if (isEditable(item)) {
-                                        setSelectedAsset(item);
-                                        setShowEdit(true);
-                                    }
-                                }
-                            }}>
-                            <span><ReactIcons.Pencil Color="var(--warning)" Size={20} /></span>
-                        </button> : null)
-                    }
-                > <p></p>
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAAsset>
-                    Key={'Delete'}
-                    AllowSort={false}
-                    HeaderStyle={{ width: '10%' }}
-                    RowStyle={{ width: '10%' }}
-                    Content={({ item }) => (isEditable(item) ?
-                        <button
-                            className={"btn btn-delete" + (isEditable(item) ? '' : ' disabled') + (hasPermissions() ? '' : ' disabled')}
-                            onClick={(e) => {
-                                if (hasPermissions()) {
-                                    e.preventDefault();
-                                    if (isEditable(item)) {
-                                        setSelectedAsset(item);
-                                        setShowDelete(true);
-                                    }
-                                }
-                            }}>
-                            <span><ReactIcons.TrashCan Color="var(--danger)" Size={20} /></span>
-                        </button> : null)
-                    }
-                > <p></p>
-                </Column>
-            </Table>
-            </div>
-            <div className="row">
-                <div className="col">
-                    <Paging
-                        Current={page + 1}
-                        SetPage={(p) => setPage(p - 1)}
-                        Total={totalPages}
-                    />
-                </div>
-            </div>
-            </>
-    }
-
     return (
-        <div className="card" style={{ flex: 1, display: 'flex', flexDirection: 'column', overflow: 'hidden' }}>
-            <div className="card-header">
-                <div className="row">
-                    <div className="col">
-                        <h4>Remote openXDA Assets:</h4>
-                    </div>
-                </div>
-                <div className="row">
-                    <div className="col">
-                        <p style={{ marginTop: 2, marginBottom: 2 }}>
-                            {searchState === 'error' ? 'Could not complete Search' :
-                                searchState === 'loading' ? 'Loading...' :
-                                    `Displaying Asset(s) ${totalRecords > 0 ? (recordsPerPage * page + 1) : 0} - ${recordsPerPage * page + searchResults.length} out of ${totalRecords}`}
-                        </p>
-                    </div>
-            </div>
-            </div>
-            <div className="card-body" style={{ display: 'flex', flexDirection: 'column', flex: 1, overflow: 'hidden' }}>
-                {cardBody}
-            </div>
-            <div className="card-footer">
-                <div className="add-new-asset">
-                    <button
-                        className={"btn btn-info" + (hasPermissions() ? '' : ' disabled')}
-                        type="submit" data-tooltip='AddAssets' onMouseEnter={() => setHover('submit')} onMouseLeave={() => setHover('none')}
-                        onClick={(e) => {
-                            if (hasPermissions()) {
-                                e.preventDefault();
-                                setShowAddAssets(true);
-                            }
-                        }}>
-                        Add Assets
-                    </button>
-                </div>
-                <ToolTip Show={hover == 'submit' && !hasPermissions()} Position={'top'} Target={"AddAssets"}>
-                    <p>Your role does not have permission. Please contact your Administrator if you believe this to be in error.</p>
-                </ToolTip>
-            </div>
-            <Warning Title={"Delete " + (selectedAsset?.RemoteXDAAssetKey ?? "Remote Asset")} Show={showDelete} Message={"Are you sure you want to delete the Remote Asset for " + (selectedAsset?.LocalAssetName ?? "No Local Name") + "?"}
-                CallBack={(conf) => {
-                    if (conf) remoteAssetController.DBAction('DELETE',selectedAsset).then(() => setRefreshTrigger(val => !val));
-                    setShowDelete(false);
-                }} />
-            <Modal Show={showEdit} Title={'Edit ' + (selectedAsset?.LocalAssetName ?? 'Remote Asset')}
-                ShowCancel={true}
-                CallBack={(conf) => {
-                    if (conf) remoteAssetController.DBAction('PATCH', remoteAsset).then(() => setRefreshTrigger(val => !val));
-                    setShowEdit(false);
-                }}
-                DisableConfirm={newInstErrors.length > 0}
-                ShowX={true}
-                Size={"lg"}
-                ConfirmShowToolTip={newInstErrors.length > 0}
-                ConfirmToolTipContent={
-                    newInstErrors.map((t, i) => <p key={i}> <ReactIcons.CrossMark Color="var(--danger)" /> {t} </p>)
-                }>
-                <RemoteAssetForm OriginalAsset={selectedAsset} SetRemoteAsset={setRemoteAsset} SetErrors={setNewInstErrors} />
-            </Modal>
+        <>
+            <GenericRelation<OpenXDA.Types.RemoteXDAAsset>
+                Controller={RemoteXDAAssetController}
+                RecordType={'Remote XDA Asset'}
+                Columns={Columns}
+                Filters={filters}
+                IsEditable={(item) => item.RemoteXDAAssetID <= 0}
+                DeleteColumn={true}
+                GetName={(record) => record.LocalAssetName}
+                BlankRecord={BlankRemoteXDAAsset}
+                RefreshCount={refreshCount}
+                AddNew={() => setShowAddAssets(true)}
+                EditForm={(record, setter, setErrors) => <RemoteAssetForm OriginalAsset={record} SetRemoteAsset={setter} SetErrors={setErrors} />}
+                HasPermissions={hasPermissions}
+            />
             <AssetSelect Type='multiple' StorageID='RemoteAssetTab' ShowModal={showAddAssets} SelectedAssets={assetList}
                 Title={"Add Assets to Remote openXDA Instance:"}
                 OnCloseFunction={(selected, conf) => {
@@ -330,13 +103,12 @@ const RemoteAssetTab = (props: IProps) => {
                             RemoteAssetName: "",
                             RemoteAssetKey: ""
                         }
-                        remoteAssetController.DBAction("POST", newRemote).then(() => setRefreshTrigger(val => !val));
+                        RemoteXDAAssetController.DBAction("POST", newRemote).then(() => refreshData(x => x+1));
                     });
                 }} />
-        </div>
-    );
-
-
+        </>
+    )
+    
 }
 
 export default RemoteAssetTab;
\ No newline at end of file
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteMeterTab.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteMeterTab.tsx
index 3f8ff23b3..0dc38c01a 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteMeterTab.tsx
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteMeterTab.tsx
@@ -23,102 +23,73 @@
 
 import * as React from 'react';
 import * as _ from 'lodash';
-import { useAppDispatch, useAppSelector } from '../hooks';
-import { Table, Column, Paging } from '@gpa-gemstone/react-table';
-import { SystemCenter, Application, OpenXDA } from '@gpa-gemstone/application-typings';
-import { RemoteXDAMeterSlice, ByMeterSlice } from '../Store/Store';
-import { LoadingScreen, Modal, Search, ServerErrorIcon, Warning, GenericController } from '@gpa-gemstone/react-interactive';
-import { ToolTip } from '@gpa-gemstone/react-forms';
+import { SystemCenter, OpenXDA } from '@gpa-gemstone/application-typings';
+import { Column } from '@gpa-gemstone/react-table'
+import { Modal, Search, GenericController, SearchBar, LoadingScreen } from '@gpa-gemstone/react-interactive';
 import { ReactIcons } from '@gpa-gemstone/gpa-symbols';
 import { BlankRemoteXDAMeter, RemoteMeterForm } from './RemoteMeterForm';
-import { DefaultSelects } from '@gpa-gemstone/common-pages';
+import GenericRelation from '../CommonComponents/GenericRelation';
+import { SystemCenter as SC } from '../global';
+import ControllerSelectPopup from '../CommonComponents/ControllerSelectPopup'
 import { SelectRoles } from '../Store/UserSettings';
+import { useAppSelector } from '../hooks'; 
+
 
 interface IProps { ID: number }
 
+const RemoteMeterController = new GenericController<OpenXDA.Types.RemoteXDAMeter>(`${homePath}api/OpenXDA/RemoteXDAMeter`, "LocalMeterName", false);
+const MeterController = new GenericController<SystemCenter.Types.DetailedMeter>(`${homePath}api/OpenXDA/ByMeter`, "Name");
+
+const columns: SC.IByCol<OpenXDA.Types.RemoteXDAMeter>[] = [
+    { Label: "Local Name", Field: "LocalMeterName", Type: "string" },
+    { Label: "Local Key", Field: "LocalAssetKey", Type: "string" },
+    { Label: "Local Alias", Field: "LocalAlias", Type: "string" },
+    { Label: "Remote XDA Name", Field: "RemoteXDAName", Type: "string", Content: ({ item }) => item.Obsfucate ? item.RemoteXDAName : item.LocalMeterName },
+    { Label: "Remote Key", Field: "RemoteXDAAssetKey", Type: "string" },
+    { Label: "Remote Alias", Field: "RemoteAlias", Type: "string" },
+    { Label: "Obfuscated", Field: "Obsfucate", Type: "boolean", Content: ({ item }) => item.Obsfucate ? <ReactIcons.CheckMark Color="var(--success)" /> : null },
+    { Label: "Synced", Field: "Synced", Type: "boolean", Content: ({ item }) => item.Synced ? <ReactIcons.CheckMark Color="var(--success)" /> : null }
+]
+
+const defaultSearchcols: Search.IField<SystemCenter.Types.DetailedMeter>[] = [
+    { label: 'Key', key: 'AssetKey', type: 'string', isPivotField: false },
+    { label: 'Name', key: 'Name', type: 'string', isPivotField: false },
+    { label: 'Substation Name', key: 'Location', type: 'string', isPivotField: false },
+    { label: 'Make', key: 'Make', type: 'string', isPivotField: false },
+    { label: 'Model', key: 'Model', type: 'string', isPivotField: false },
+    { label: 'Number of Assets', key: 'MappedAssets', type: 'number', isPivotField: false },
+    { label: 'Description', key: 'Description', type: 'string', isPivotField: false },
+];
 
 const RemoteMeterTab = (props: IProps) => {
-    // Display Remote Meters Consts
-    const [sortKey, setSortKey] = React.useState<keyof OpenXDA.Types.RemoteXDAMeter>('LocalMeterName');
-    const [ascending, setAscending] = React.useState<boolean>(true);
-    const dispatch = useAppDispatch();
-    const remoteMeterStatus = useAppSelector(RemoteXDAMeterSlice.Status) as Application.Types.Status;
-    const [searchResults, setSearchResults] = React.useState<OpenXDA.Types.RemoteXDAMeter[]>([]);
-    const [searchState, setSearchState] = React.useState<Application.Types.Status>('uninitiated');
-
-    const noSameFilter: Search.IFilter<OpenXDA.Types.RemoteXDAMeter> = {
-        FieldName: 'ID',
-        SearchText: searchResults.map((r) => r.LocalXDAMeterID).join(','),
-        Operator: 'NOT IN',
-        Type: 'number',
-        IsPivotColumn: false
-    };
-
-    const [page, setPage] = React.useState<number>(0);
-    const [totalPages, setTotalPages] = React.useState<number>(0);
-    const [totalRecords, setTotalRecords] = React.useState<number>(0);
-    const [recordsPerPage, setRecordsPerPage] = React.useState<number>(0);
-    const [refreshTrigger, setRefreshTrigger] = React.useState<boolean>(false);
-
-    // Shared Consts
-    const [selectedMeter, setSelectedMeter] = React.useState<OpenXDA.Types.RemoteXDAMeter>(BlankRemoteXDAMeter);
-
-    // Edit and Delete Form Consts
-    const [newInstErrors, setNewInstErrors] = React.useState<string[]>([]);
-    const [remoteMeter, setRemoteMeter] = React.useState<OpenXDA.Types.RemoteXDAMeter>(BlankRemoteXDAMeter);
-    const [showEdit, setShowEdit] = React.useState<(boolean)>(false);
-    const [showDelete, setShowDelete] = React.useState<(boolean)>(false);
-
-    // Add New Meter Consts
-    const meterStatus = useAppSelector(ByMeterSlice.Status) as Application.Types.Status;
-    const [meterList, setMeterList] = React.useState<Array<SystemCenter.Types.DetailedMeter>>([]);
     const [showAddMeters, setShowAddMeters] = React.useState<(boolean)>(false);
-
-    // Add New Assets for Meter
-    const [showLoading, setShowLoading] = React.useState<(boolean)>(false);
+    const [selectedMeter, setSelectedMeter] = React.useState<OpenXDA.Types.RemoteXDAMeter | null>(null)
+    const [meterList, setMeterList] = React.useState<SystemCenter.Types.DetailedMeter[]>([]);
+    const [refreshCount, refreshData] = React.useState<number>(0);
+    const [searchResults, setSearchResults] = React.useState<OpenXDA.Types.RemoteXDAMeter[]>([]);
     const [assetCount, setAssetCount] = React.useState<number>(0);
+    const [showLoading, setShowLoading] = React.useState<boolean>(false);
 
     const roles = useAppSelector(SelectRoles);
-    const [hover, setHover] = React.useState<('submit' | 'clear' | 'none')>('none');
-
-    const remoteMeterController = React.useMemo(() => new GenericController<OpenXDA.Types.RemoteXDAMeter>(`${homePath}api/OpenXDA/RemoteXDAMeter`, "LocalMeterName", false), [])
-    const searchFilters: Search.IFilter<OpenXDA.Types.RemoteXDAMeter>[] = React.useMemo(() => [{  FieldName: 'RemoteXDAInstanceID',   SearchText: props.ID.toString(), Operator: '=', Type: 'number',  IsPivotColumn: false }],[props.ID])
-
-    React.useEffect(() => {
-        if (remoteMeterStatus === 'uninitiated' || remoteMeterStatus === 'changed')
-            dispatch(RemoteXDAMeterSlice.Fetch());
-    }, [dispatch, remoteMeterStatus]);
 
-    React.useEffect(() => {
-        if (meterStatus === 'uninitiated' || meterStatus === 'changed')
-            dispatch(ByMeterSlice.Fetch());
-    }, [dispatch, meterStatus]);
-
-    React.useEffect(() => {
-        setSearchState('loading')
-        const handle = remoteMeterController.PagedSearch(searchFilters, sortKey, ascending, page);
-
-        handle.done((d) => {
-            setSearchResults(JSON.parse(d.Data as unknown as string));
-            setTotalPages(d.NumberOfPages);
-            setTotalRecords(d.TotalRecords);
-            setRecordsPerPage(d.RecordsPerPage);
-            if (page >= d.NumberOfPages)
-                setPage(Math.max(d.NumberOfPages - 1, 0));
-            setSearchState('idle')
-        })
+    function hasPermissions(): boolean {
+        if (roles.indexOf('Administrator') < 0)
+            return false;
+        return true;
+    }
 
-        handle.fail(() => setSearchState('error'))
+    const searchFilters: Search.IFilter<OpenXDA.Types.RemoteXDAMeter>[] = React.useMemo(() => [{ FieldName: 'RemoteXDAInstanceID', SearchText: props.ID.toString(), Operator: '=', Type: 'number', IsPivotColumn: false }], [props.ID])
 
-        return () => {
-            if (handle != null && handle.abort != null) handle.abort();
+    const noSameFilter: Search.IFilter<SystemCenter.Types.DetailedMeter> = React.useMemo(() => {
+        const filter = {
+            FieldName: 'ID',
+            SearchText: searchResults.map((r) => r.LocalXDAMeterID).join(','),
+            Operator: 'NOT IN' as Search.OperatorType,
+            Type: 'string' as Search.FieldType,
+            IsPivotColumn: false
         }
-
-    }, [ascending, sortKey, remoteMeterController, searchFilters, refreshTrigger])
-
-    function isEditable(item: OpenXDA.Types.RemoteXDAMeter): boolean {
-        return item.RemoteXDAMeterID <= 0;
-    }
+        return filter;
+    }, [searchResults]);
 
     function getAssociatedAssetCount(meter: OpenXDA.Types.RemoteXDAMeter): JQuery.jqXHR<number> {
         return $.ajax({
@@ -130,7 +101,6 @@ const RemoteMeterTab = (props: IProps) => {
             async: true
         });
     }
-
     function addAssociatedAssets(meter: OpenXDA.Types.RemoteXDAMeter): JQuery.jqXHR<number> {
         return $.ajax({
             type: "GET",
@@ -142,302 +112,108 @@ const RemoteMeterTab = (props: IProps) => {
         });
     }
 
-    function hasPermissions(): boolean {
-        if (roles.indexOf('Administrator') < 0)
-            return false;
-        return true;
-    }
-
-    let cardBody;
-    if (remoteMeterStatus === 'error') {
-        cardBody = <ServerErrorIcon Show={true} Size={40} Label={'A Server Error Occurred. Please Reload the Application.'} />
-    } else if (remoteMeterStatus === 'loading' || showLoading) {
-        cardBody = <LoadingScreen Show={true} />
-    } else {
-        cardBody =
-            <>
-            <div className="row d-flex flex-column" style={{ flex: 1, overflow: 'hidden' }}>
-            <Table<OpenXDA.Types.RemoteXDAMeter>
-                TableClass="table table-hover"
-                Data={searchResults}
-                SortKey={sortKey}
-                Ascending={ascending}
-                OnSort={(d) => {
-                    if (d.colKey == 'Edit' || d.colKey == 'Delete') return;
-                    if (d.colKey === sortKey)
-                        setAscending(!ascending);
-                    else {
-                        setAscending(true);
-                        setSortKey(d.colField);
-                    }
-                }}
-                TheadStyle={{ fontSize: 'smaller' }}
-                RowStyle={{ fontSize: 'smaller' }}
-                Selected={(item) => false}
-                KeySelector={(item) => item.ID}
-            >
-                <Column<OpenXDA.Types.RemoteXDAMeter>
-                    Key={'LocalMeterName'}
-                    AllowSort={true}
-                    Field={'LocalMeterName'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                > Local Name
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAMeter>
-                    Key={'LocalAssetKey'}
-                    AllowSort={true}
-                    Field={'LocalAssetKey'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                > Local Key
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAMeter>
-                    Key={'LocalAlias'}
-                    AllowSort={true}
-                    Field={'LocalAlias'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                > Local Alias
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAMeter>
-                    Key={'RemoteXDAName'}
-                    AllowSort={true}
-                    Field={'RemoteXDAName'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                    Content={({ item }) => item.Obsfucate ? item.RemoteXDAName : item.LocalMeterName}
-                > Remote Name
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAMeter>
-                    Key={'RemoteXDAAssetKey'}
-                    AllowSort={true}
-                    Field={'RemoteXDAAssetKey'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                > Remote Key
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAMeter>
-                    Key={'RemoteAlias'}
-                    AllowSort={true}
-                    Field={'RemoteAlias'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                > Remote Alias
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAMeter>
-                    Key={'Obsfucate'}
-                    AllowSort={true}
-                    Field={'Obsfucate'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                    Content={({ item }) => item.Obsfucate ? <ReactIcons.CheckMark Color="var(--success)" /> : null }
-                > Obfuscated
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAMeter>
-                    Key={'Synced'}
-                    AllowSort={true}
-                    Field={'Synced'}
-                    HeaderStyle={{ width: 'auto' }}
-                    RowStyle={{ width: 'auto' }}
-                    Content={({ item }) => item.Synced ? <ReactIcons.CheckMark Color="var(--success)" /> : null }
-                > Synced
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAMeter>
-                    Key={'Edit'}
-                    AllowSort={false}
-                    HeaderStyle={{ width: '10%' }}
-                    RowStyle={{ width: '10%' }}
-                    Content={({ item }) => (isEditable(item) ?
-                        <button
-                            className={"btn btn-edit" + (isEditable(item) ? '' : ' disabled') + (hasPermissions() ? '' : ' disabled')}
-                            onClick={(e) => {
-                                if (hasPermissions()) {
-                                    e.preventDefault();
-                                    if (isEditable(item)) {
-                                        setSelectedMeter(item);
-                                        setShowEdit(true);
-                                    }
-                                }
-                            }}>
-                            <span><ReactIcons.Pencil Color="var(--warning)" Size={20} /></span>
-                        </button> : null)
-                    }
-                > <p></p>
-                </Column>
-                <Column<OpenXDA.Types.RemoteXDAMeter>
-                    Key={'Delete'}
-                    AllowSort={false}
-                    HeaderStyle={{ width: '10%' }}
-                    RowStyle={{ width: '10%' }}
-                    Content={({ item }) => (isEditable(item) ?
-                        <button
-                            className={"btn btn-delete" + (isEditable(item) ? '' : ' disabled') + (hasPermissions() ? '' : ' disabled')}
-                            onClick={(e) => {
-                                if (hasPermissions()) {
-                                    e.preventDefault();
-                                    if (isEditable(item)) {
-                                        setSelectedMeter(item);
-                                        setShowDelete(true);
-                                    }
-                                }
-                            }}>
-                            <span><ReactIcons.TrashCan Color="var(--danger)" Size={20} /></span>
-                        </button> : null)
-                    }
-                > <p></p>
-                </Column>
-            </Table>
-            </div>
-            <div className="row">
-                <div className="col">
-                    <Paging
-                        Current={page + 1}
-                        SetPage={(p) => setPage(p - 1)}
-                        Total={totalPages}
-                    />
-                </div>
-            </div>
-            </>
-    }
-
-    return (
-        <div className="card" style={{ flex: 1, display: 'flex', flexDirection: 'column', overflow: 'hidden' }}>
-            <div className="card-header">
-                <div className="row">
-                    <div className="col">
-                        <h4>Remote openXDA Meters:</h4>
-                    </div>
-                </div>
-                <div className="row">
-                    <div className="col">
-                        <p style={{ marginTop: 2, marginBottom: 2 }}>
-                            {searchState === 'error' ? 'Could not complete Search' :
-                                searchState === 'loading' ? 'Loading...' :
-                                    `Displaying Meter(s) ${totalRecords > 0 ? (recordsPerPage * page + 1) : 0} - ${recordsPerPage * page + searchResults.length} out of ${totalRecords}`}
-                        </p>
-            </div>
-                </div>
-
-            </div>
-            <div className="card-body" style={{ display: 'flex', flexDirection: 'column', flex: 1, overflow: 'hidden' }}>
-                {cardBody}
-            </div>
-            <div className="card-footer">
-                <div className="add-new-meter">
-                    <button
-                        className={"btn btn-info" + (hasPermissions() ? '' : ' disabled')}
-                        type="submit" data-tooltip='AddMeters' onMouseEnter={() => setHover('submit')} onMouseLeave={() => setHover('none')}
-                        onClick={(e) => {
-                            if (hasPermissions()) {
-                                e.preventDefault();
-                                setShowAddMeters(true);
-                            }
-                        }}>
-                        Add Meter
-                    </button>
-                </div>
-                <ToolTip Show={hover == 'submit' && !hasPermissions()} Position={'top'} Target={"AddMeters"}>
-                    <p>Your role does not have permission. Please contact your Administrator if you believe this to be in error.</p>
-                </ToolTip>
-            </div>
-            <Warning Title={"Delete " + (selectedMeter?.RemoteXDAName ?? "Remote Meter")} Show={showDelete} Message={"Are you sure you want to delete the Remote Meter for " + (selectedMeter?.LocalMeterName ?? "No Local Name") + "?"}
-                CallBack={(conf) => {
-                    if (conf) remoteMeterController.DBAction('DELETE',selectedMeter).then(() => setRefreshTrigger(val => !val));
-                    setShowDelete(false);
-                }}/>
-            <Modal Show={showEdit} Title={'Edit ' + (selectedMeter?.LocalMeterName ?? 'Remote Meter')}
-                ShowCancel={true}
-                CallBack={(conf) => {
-                    if (conf) remoteMeterController.DBAction('PATCH', remoteMeter).then(() => setRefreshTrigger(val => !val));
-                    setShowEdit(false);
-                }}
-                DisableConfirm={newInstErrors.length > 0}
-                ShowX={true}
-                Size={"lg"}
-                ConfirmShowToolTip={newInstErrors.length > 0}
-                ConfirmToolTipContent={
-                    newInstErrors.map((t, i) => <p key={i}> <ReactIcons.CrossMark Color="var(--danger)" /> {t} </p>)
-                }>
-                <RemoteMeterForm OriginalMeter={selectedMeter} SetRemoteMeter={setRemoteMeter} SetErrors={setNewInstErrors} />
-            </Modal>
-            <Modal Show={assetCount > 0} Title={'Add Associated Remote Assets?'}
-                ShowCancel={true}
-                CallBack={(conf) => {
-                    setAssetCount(0);
-                    if (conf) {
-                        let addAssetHandle = addAssociatedAssets(selectedMeter);
-                        addAssetHandle.then(() => setRefreshTrigger(val => !val));
-                        return () => {
-                            if (addAssetHandle != null && addAssetHandle.abort != null) {
-                                addAssetHandle.abort();
-                            }
-                        };
-
-                    }
-                }}
-                ShowX={true} Size={"sm"}
-                ConfirmText={"Yes"}
-                CancelText={"No"}>
-                <p>Add { assetCount } Associated Assets?</p>
-            </Modal>
-            <DefaultSelects.Meter
-                Slice={ByMeterSlice}
-                Selection={meterList}
-                OnClose={(selected, conf) => {
-                    setShowAddMeters(false);
-                    setMeterList([]);
-                    if (!conf) return;
-                    selected.forEach((meter) => {
-                        setShowLoading(true);
-                        let newRemote: OpenXDA.Types.RemoteXDAMeter = {
-                            ID: -1,
-                            RemoteXDAInstanceID: props.ID,
-                            LocalXDAMeterID: meter.ID,
-                            RemoteXDAMeterID: -1,
-                            RemoteXDAName: "",
-                            RemoteXDAAssetKey: meter.AssetKey,
-                            Obsfucate: false,
-                            Synced: false,
-                            LocalAlias: "",
-                            LocalMeterName: "",
-                            LocalAssetKey: "",
-                            RemoteAlias: ""
+    return (<>
+        <LoadingScreen Show={showLoading} />
+        <GenericRelation<OpenXDA.Types.RemoteXDAMeter>
+            RecordType={"Remote XDA Meter"}
+            Controller={RemoteMeterController}
+            Columns={columns}
+            DefaultSort={'LocalMeterName'}
+            AddNew={() => { setShowAddMeters(true) }}
+            SetSearchResults={setSearchResults}
+            EditForm={(record, setter, setErrors) => { return <RemoteMeterForm OriginalMeter={record} SetRemoteMeter={setter} SetErrors={setErrors} /> }}
+            DeleteColumn={true}
+            IsEditable={(item) => item.RemoteXDAMeterID <= 0}
+            Filters={searchFilters}
+            GetName={(record) => record.LocalMeterName}
+            RefreshCount={refreshCount}
+            BlankRecord={BlankRemoteXDAMeter}
+            HasPermissions={hasPermissions}
+        />
+        <Modal Show={assetCount > 0} Title={'Add Associated Remote Assets?'}
+            ShowCancel={true}
+            CallBack={(conf) => {
+                setAssetCount(0);
+                if (conf) {
+                    let addAssetHandle = addAssociatedAssets(selectedMeter);
+                    addAssetHandle.then(() => refreshData(x => x + 1));
+                    return () => {
+                        if (addAssetHandle != null && addAssetHandle.abort != null) {
+                            addAssetHandle.abort();
                         }
-                        remoteMeterController.DBAction("POST", newRemote);
-                        setSelectedMeter(newRemote); // Technically, this is a race condition with setAssetCount
-                        let fetchAssetHandle = getAssociatedAssetCount(newRemote);
-                        fetchAssetHandle.then((data: number) => {
-                            setRefreshTrigger(val => !val);
-                            setAssetCount(data);
-                            setShowLoading(false);
-                        });
-                        return () => {
-                            if (fetchAssetHandle != null && fetchAssetHandle.abort != null) {
-                                fetchAssetHandle.abort();
-                                setShowLoading(false);
-                            }
-                        };
+                    };
+
+                }
+            }}
+            ShowX={true} Size={"sm"}
+            ConfirmText={"Yes"}
+            CancelText={"No"}>
+            <p>Add {assetCount} Associated Assets?</p>
+        </Modal>
+        <ControllerSelectPopup<SystemCenter.Types.DetailedMeter>
+            Controller={MeterController}
+            Searchbar={(children, setFilters) => (
+                <SearchBar<SystemCenter.Types.DetailedMeter>
+                    CollumnList={defaultSearchcols}
+                    SetFilter={setFilters}
+                    Direction={'left'}
+                    defaultCollumn={{ label: 'Name', key: 'Name', type: 'string', isPivotField: false }}
+                    Width={'50%'}
+                    Label={'Search'}
+                >
+                    {children}
+                </SearchBar>)}
+            Selection={meterList}
+            OnClose={(selected, conf) => {
+                setShowAddMeters(false);
+                setMeterList([]);
+                if (!conf) return;
+                selected.forEach((meter) => {
+                    setShowLoading(true);
+                    let newRemote: OpenXDA.Types.RemoteXDAMeter = {
+                        ID: -1,
+                        RemoteXDAInstanceID: props.ID,
+                        LocalXDAMeterID: meter.ID,
+                        RemoteXDAMeterID: -1,
+                        RemoteXDAName: "",
+                        RemoteXDAAssetKey: meter.AssetKey,
+                        Obsfucate: false,
+                        Synced: false,
+                        LocalAlias: "",
+                        LocalMeterName: "",
+                        LocalAssetKey: "",
+                        RemoteAlias: ""
+                    }
+                    RemoteMeterController.DBAction("POST", newRemote);
+                    setSelectedMeter(newRemote); // Technically, this is a race condition with setAssetCount
+                    let fetchAssetHandle = getAssociatedAssetCount(newRemote);
+                    fetchAssetHandle.then((data: number) => {
+                        refreshData(x => x + 1);
+                        setAssetCount(data);
+                        setShowLoading(false);
                     });
-                }}
-                Show={showAddMeters}
-                Type={'single'}
-                Title={"Add Meter to Remote openXDA Instance:"}
-                GetEnum={() => () => { }}
-                GetAddlFields={() => () => { }}
-                AddlFilters={[noSameFilter]}
-            >
-                <Column Key="Name" Field="Name" HeaderStyle={{ width: 'auto' }} RowStyle={{ width: 'auto' }}
-                >Name</Column>
-                <Column Key="AssetKey" Field="AssetKey" HeaderStyle={{ width: 'auto' }} RowStyle={{ width: 'auto' }}
-                >Key</Column>
-                <Column Key="Location" Field="Location" HeaderStyle={{ width: 'auto' }} RowStyle={{ width: 'auto' }}
-                >Substation</Column>
-            </DefaultSelects.Meter>
-        </div>
-    );
-
-
+                    return () => {
+                        if (fetchAssetHandle != null && fetchAssetHandle.abort != null) {
+                            fetchAssetHandle.abort();
+                            setShowLoading(false);
+                        }
+                    };
+                });
+            }}
+            Show={showAddMeters}
+            Type={'single'}
+            Title={"Add Meter to Remote openXDA Instance:"}
+            Filters={[noSameFilter]}
+        >
+            <Column Key="Name" Field="Name" HeaderStyle={{ width: 'auto' }} RowStyle={{ width: 'auto' }}
+            >Name</Column>
+            <Column Key="AssetKey" Field="AssetKey" HeaderStyle={{ width: 'auto' }} RowStyle={{ width: 'auto' }}
+            >Key</Column>
+            <Column Key="Location" Field="Location" HeaderStyle={{ width: 'auto' }} RowStyle={{ width: 'auto' }}
+            >Substation</Column>
+        </ControllerSelectPopup>
+    </>
+    )
 }
 
 export default RemoteMeterTab;
\ No newline at end of file
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteXDAInstance.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteXDAInstance.tsx
index 7a6fce3b5..4ef0e251a 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteXDAInstance.tsx
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteXDAInstance.tsx
@@ -23,85 +23,39 @@
 
 import * as React from 'react';
 import * as _ from 'lodash';
-import { LoadingScreen, TabSelector, Warning } from '@gpa-gemstone/react-interactive';
-import { useAppDispatch, useAppSelector } from '../hooks';
-import { RemoteXDAInstanceSlice } from '../Store/Store';
 import { Application, OpenXDA } from '@gpa-gemstone/application-typings';
 import SystemSettingsTab from './SystemSettingsTab'
 import RemoteAssetTab from './RemoteAssetTab'
 import RemoteMeterTab from './RemoteMeterTab';
+import GenericRecord, { IRecordTab } from '../CommonComponents/GenericRecord';
 
 declare var homePath: string;
 declare type Tab = 'systemSettings' | 'remoteMeter' | 'remoteAsset'
 
 interface IProps { Roles: Array<Application.Types.SecurityRoleName>, ID: number, Tab: Tab }
 
-function RemoteXDAInstance(props: IProps) {
-    const dispatch = useAppDispatch();
-
-    const instStatus = useAppSelector(RemoteXDAInstanceSlice.Status) as Application.Types.Status;
-    const connection = useAppSelector((state) => RemoteXDAInstanceSlice.Datum(state, props.ID));
-
-    const [tab, setTab] = React.useState(getTab());
-    const [loading, setLoading] = React.useState<boolean>(false);
-    const [showDelete, setShowDelete] = React.useState<boolean>(false);
-
-
-    React.useEffect(() => {
-        if (instStatus === 'uninitiated' || instStatus === 'changed')
-            dispatch(RemoteXDAInstanceSlice.Fetch());
-    }, [dispatch, instStatus]);
-
-    React.useEffect(() => {
-        const saved = getTab();
-        if (saved !== tab)
-            sessionStorage.setItem('RemoteXDAInstance.Tab', JSON.stringify(tab));
-    }, [tab]);
-
-    function getTab(): Tab {
-        if (props.Tab != undefined) return props.Tab;
-        else if (sessionStorage.hasOwnProperty('RemoteXDAInstance.Tab'))
-            return JSON.parse(sessionStorage.getItem('RemoteXDAInstance.Tab'));
-        else
-            return 'systemSettings';
-    }
-
-    function deleteConnection(): void {
-        setLoading(true);
-        if (props.Roles.includes('Administrator'))
-            dispatch(RemoteXDAInstanceSlice.DBAction({ verb: 'DELETE', record: connection }));
-        setLoading(false);
-        window.location.href = homePath + 'index.cshtml?name=RemoteXDAInstanceMain';
-    };
-
-    const Tabs = [
-        { Id: "systemSettings", Label: "System Settings" },
-        { Id: "remoteMeter", Label: "Remote Meters" },
-        { Id: "remoteAsset", Label: "Remote Assets" },
-    ];
-
-    if (connection == null) return null;
+const tabs: IRecordTab<OpenXDA.Types.RemoteXDAInstance>[] = [
+    { Id: 'systemSettings', Label: "System Settings", Content: (record, setter, patch, clear, errors, setErrors, warnings) => <SystemSettingsTab SelectedRecord={record} SetSelectedRecord={setter} Patch={patch} ClearChanges={clear} Errors={errors} SetErrors={setErrors} Warnings={warnings} /> },
+    { Id: "remoteMeter", Label: "Remote Meter", Content: (rec) => <RemoteMeterTab ID={rec.ID} /> },
+    { Id: "remoteAsset", Label: "Remote Asset", Content: (rec) => <RemoteAssetTab ID={rec.ID} /> }
+]
 
+function RemoteXDAInstance({Roles, ID, Tab }: IProps) {
     return (
-        <div style={{ width: '100%', height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
-            <div className="row p-2">
-                <div className="col">
-                    <h2>{connection.Name}</h2>
-                </div>
-                <div className="col">
-                    <button className="btn btn-danger pull-right" disabled={!props.Roles.includes('Administrator')} onClick={() => setShowDelete(true)}>Delete Remote Connection</button>
-                </div>
-            </div>
-            <hr />
-            <TabSelector CurrentTab={tab} SetTab={(t: Tab) => setTab(t)} Tabs={Tabs} />
-            {tab === 'systemSettings' ? <SystemSettingsTab ID={props.ID} /> : null}
-            {tab === 'remoteMeter' ? <RemoteMeterTab ID={props.ID} /> : null}
-            {tab === 'remoteAsset' ? <RemoteAssetTab ID={props.ID} /> : null}
-
-            <Warning Message={'This will permanently delete this Remote openXDA Instance Connection and cannot be undone.'} Show={showDelete} Title={'Delete ' + (connection?.Name ?? 'Remote Connection')} CallBack={(conf) => { if (conf) deleteConnection(); setShowDelete(false); }} />
-            <LoadingScreen Show={loading} />
-        </div>
+        <GenericRecord<OpenXDA.Types.RemoteXDAInstance>
+            RecordID={ID}
+            RecordType={"Remote XDA Instance"}
+            TabLocalStorage={"RemoteXDAInstance.Tab"}
+            ControllerPath={`${homePath}api/OpenXDA/remoteXDAInstance`}
+            DefaultSort={"Name"}
+            GetOnePath={`${homePath}api/OpenXDA/remoteXDAInstance/One/`}
+            Redirect={`${homePath}index.cshtml?name=RemoteXDAInstanceMain`}
+            DefaultTab={"systemSettings"}
+            GetName={(record) => record.Name}
+            Tabs={tabs}
+            HasDeletePermission={() => Roles.includes('Administrator')}
+            HasPatchPermission={() => Roles.includes('Administrator')}
+        />
     )
 }
-
 export default RemoteXDAInstance;
\ No newline at end of file
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteXDAInstanceForm.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteXDAInstanceForm.tsx
index 4f179b137..9120f6f1f 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteXDAInstanceForm.tsx
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteXDAInstanceForm.tsx
@@ -45,7 +45,8 @@ const BlankRemoteXDAInstance: OpenXDA.Types.RemoteXDAInstance = {
 interface IProps {
     BaseInstance: OpenXDA.Types.RemoteXDAInstance,
     SetInstance: (instance: OpenXDA.Types.RemoteXDAInstance) => void,
-    SetErrors?: (e: string[]) => void, RenderPortalId?: string
+    SetErrors?: (e: string[]) => void,
+    RenderPortalId?: string
 }
 
 export default function RemoteXDAInstanceForm(props: IProps) {
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/SystemSettingsTab.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/SystemSettingsTab.tsx
index 4589519ab..e63619329 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/SystemSettingsTab.tsx
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/SystemSettingsTab.tsx
@@ -23,113 +23,35 @@
 
 import * as React from 'react';
 import * as _ from 'lodash';
-import { useAppDispatch, useAppSelector } from '../hooks';
-import { Application, OpenXDA } from '@gpa-gemstone/application-typings';
-import { RemoteXDAInstanceSlice } from '../Store/Store';
-import { LoadingScreen, ServerErrorIcon } from '@gpa-gemstone/react-interactive';
-import { ToolTip } from '@gpa-gemstone/react-forms';
-import { ReactIcons } from '@gpa-gemstone/gpa-symbols';
-import { RemoteXDAInstanceForm} from './RemoteXDAInstanceForm';
-
-interface IProps { ID: number }
-
+import { OpenXDA } from '@gpa-gemstone/application-typings';
+import { RemoteXDAInstanceForm } from './RemoteXDAInstanceForm';
+import GenericInfo from '../CommonComponents/GenericInfo';
+
+interface IProps {
+    SelectedRecord: OpenXDA.Types.RemoteXDAInstance
+    SetSelectedRecord: React.Dispatch<React.SetStateAction<OpenXDA.Types.RemoteXDAInstance>>
+    Errors: string[]
+    SetErrors: React.Dispatch<React.SetStateAction<string[]>>
+    Warnings: string[]
+    ClearChanges: () => void
+    Patch: () => void
+}
 
 const SystemSettingsTab = (props: IProps) => {
-    const [hover, setHover] = React.useState<('submit' | 'clear' | 'none')>('none');
-
-    const dispatch = useAppDispatch();
-    const instStatus = useAppSelector(RemoteXDAInstanceSlice.Status) as Application.Types.Status;
-    const connection = useAppSelector((state) => RemoteXDAInstanceSlice.Datum(state, props.ID));
-
-    const [newInstErrors, setNewInstErrors] = React.useState<string[]>([]);
-    const [baseInstance, setBaseInstance] = React.useState<OpenXDA.Types.RemoteXDAInstance>(connection);
-    const [formInstance, setFormInstance] = React.useState<OpenXDA.Types.RemoteXDAInstance>(connection);
-
-
-    React.useEffect(() => {
-        if (instStatus === 'uninitiated' || instStatus === 'changed')
-            dispatch(RemoteXDAInstanceSlice.Fetch());
-    }, [dispatch, instStatus]);
-
-    React.useEffect(() => {
-        setFormInstance(connection);
-        setBaseInstance(connection);
-    }, [connection]);
-
-    if (connection == null)
-        return null;
-
-    let cardBody;
-    if (instStatus === 'error') {
-        cardBody = <ServerErrorIcon Show={true} Size={40} Label={'A Server Error Occurred. Please Reload the Application.'} />
-    } else if (instStatus === 'loading') {
-        cardBody = <LoadingScreen Show={true} />
-    } else {
-        cardBody = <RemoteXDAInstanceForm BaseInstance={baseInstance} SetInstance={setFormInstance} SetErrors={setNewInstErrors} />
-    }
-
     return (
-        <div className="card" style={{ flex: 1, display: 'flex', flexDirection: 'column', overflow: 'hidden' }}>
-            <div className="card-header">
-                <div className="row">
-                    <div className="col">
-                        <h4>Remote openXDA Instance Connection Information:</h4>
-                    </div>
-                </div>
-            </div>
-            <div className="card-body" style={{ flex: 1, overflowY: 'auto' }}>
-                {cardBody}
-            </div>
-            <div className="card-footer">
-                <div className="btn-group mr-2">
-                    <button
-                        className={"btn btn-primary" + ((newInstErrors.length !== 0 || _.isEqual(baseInstance, formInstance)) ? ' disabled' : '')}
-                        type="submit"
-                        onClick={() => {
-                            if (newInstErrors.length === 0 && !_.isEqual(baseInstance, formInstance)) {
-                                dispatch(RemoteXDAInstanceSlice.DBAction({ verb: 'PATCH', record: formInstance }));
-                            }
-                        }}
-                        data-tooltip='submit'
-                        onMouseEnter={() => setHover('submit')}
-                        onMouseLeave={() => setHover('none')}>
-                        Save Changes
-                    </button>
-                </div>
-                <ToolTip
-                    Show={(newInstErrors.length != 0) && hover == 'submit'}
-                    Position={'top'}
-                    Target={"submit"}>
-                    {newInstErrors.map((t, i) =>
-                        <p key={i}> <ReactIcons.CrossMark Color="var(--danger)" /> {t} </p>
-                    )}
-                </ToolTip>
-                <div className="btn-group mr-2">
-                    <button
-                        className={"btn btn-warning" + (_.isEqual(baseInstance, formInstance) ? ' disabled' : '')}
-                        data-tooltip="clear" onClick={() => {
-                            setBaseInstance(_.cloneDeep(connection));
-                        }}
-                        onMouseEnter={() => setHover('clear')}
-                        onMouseLeave={() => setHover('none')}>
-                        Clear Changes
-                    </button>
-                </div>
-                <ToolTip
-                    Show={!_.isEqual(baseInstance, formInstance) && hover == 'clear'}
-                    Position={'top'}
-                    Target={"clear"}>
-
-                    {baseInstance.Name != formInstance.Name ? <p> <ReactIcons.Warning Color="var(--warning)" /> Changes to Name will be discarded.</p> : null}
-                    {baseInstance.Address != formInstance.Address ? <p> <ReactIcons.Warning Color= "var(--warning)" /> Changes to Address will be discarded.</p> : null}
-                    {baseInstance.Frequency != formInstance.Frequency ? <p> <ReactIcons.Warning Color="var(--warning)" /> Changes to Frequency will be discarded.</p> : null}
-                </ToolTip>
-            </div>
-
-        </div>
-    );
-
-
+        <GenericInfo<OpenXDA.Types.RemoteXDAInstance>
+            Forms={[(record, setter, setErrors) => <RemoteXDAInstanceForm BaseInstance={record} SetInstance={setter} SetErrors={setErrors} />]}
+            HasPermissions={() => true}
+            RecordType={'Remote XDA Instance'}
+            SelectedRecord={props.SelectedRecord}
+            SetSelectedRecord={props.SetSelectedRecord}
+            Errors={props.Errors}
+            SetErrors={props.SetErrors}
+            Warnings={props.Warnings}
+            ClearChanges={props.ClearChanges}
+            Patch={props.Patch}
+        />
+    )
 }
 
 export default SystemSettingsTab;
\ No newline at end of file
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Store/Store.ts b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Store/Store.ts
index 3bc909fdd..9f19b642b 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Store/Store.ts
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Store/Store.ts
@@ -31,7 +31,6 @@ import NoteSlice from './NoteSlice';
 import AdditionalUserFieldSlice from './AdditionalUserFieldSlice';
 import ConfigurationSlice from './ConfigurationSlice';
 import { PQApplications } from '../ApplicationCategory/Applications';
-import { DBCleanup } from '../DB/DBCleanup';
 import { ApplicationCategory } from '../ApplicationCategory/ByApplicationCategory';
 import { OpenXDA as LocalXDA, SystemCenter as LocalSystemCenter } from '../global'
 import PQISlice from './PQISlice';
@@ -80,10 +79,6 @@ export const ByAssetSlice = new GenericSlice<SystemCenter.Types.DetailedAsset>("
 export const ByLocationSlice = new GenericSlice<SystemCenter.Types.DetailedLocation>("ByLocation", `${homePath}api/OpenXDA/ByLocation`, "Name", true);
 export const ByMeterSlice = new GenericSlice<SystemCenter.Types.DetailedMeter>("ByMeter", `${homePath}api/OpenXDA/ByMeter`, "Name", true);
 
-export const RemoteXDAInstanceSlice = new GenericSlice<OpenXDA.Types.RemoteXDAInstance>("remoteXDAInstance", `${homePath}api/OpenXDA/remoteXDAInstance`, "Name", false);
-export const RemoteXDAMeterSlice = new GenericSlice<OpenXDA.Types.RemoteXDAMeter>("RemoteXDAMeter", `${homePath}api/OpenXDA/RemoteXDAMeter`, "LocalMeterName", false);
-export const RemoteXDAAssetSlice = new GenericSlice<OpenXDA.Types.RemoteXDAAsset>("RemoteXDAAsset", `${homePath}api/OpenXDA/RemoteXDAAsset`, "LocalAssetName", false);
-
 export const AssetNoteSlice = new NoteSlice('Asset');
 export const MeterNoteSlice = new NoteSlice('Meter');
 export const UserNoteSlice = new NoteSlice('User');
@@ -142,9 +137,6 @@ const store = configureStore({
         EventType: EventTypeSlice.Reducer,
         MeasurementCharacteristic: MeasurementCharacteristicSlice.Reducer,
         ExternalDataBaseTable: ExternalDBTablesSlice.Reducer,
-        remoteXDAInstance: RemoteXDAInstanceSlice.Reducer,
-        RemoteXDAAsset: RemoteXDAAssetSlice.Reducer,
-        RemoteXDAMeter: RemoteXDAMeterSlice.Reducer,
         ApplicationNode: ApplicationNodeSlice.Reducer,
         PQApplicationCategory: ApplicationCategorySlice.Reducer,
         PQApplications: PQApplicationsSlice.Reducer,
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/global.d.ts b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/global.d.ts
index 7d4ce734f..fd9af7fea 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/global.d.ts
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/global.d.ts
@@ -95,6 +95,7 @@ export namespace SystemCenter {
         PercentFinished: number
         RecordsAffected: number
     }
+
 }
 
 // OpenXDA Models
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/hooks.ts b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/hooks.ts
index a6c96a4bd..dce201085 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/hooks.ts
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/hooks.ts
@@ -24,13 +24,19 @@
 import * as React from 'react';
 import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
 import { Application } from '@gpa-gemstone/application-typings';
-import { GenericController } from '@gpa-gemstone/react-interactive';
+import { GenericController, Search } from '@gpa-gemstone/react-interactive';
 import { AppDispatch, RootState } from './Store/Store';
 
-
 export const useAppDispatch: () => AppDispatch = useDispatch;
 export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
 
+interface IPagedResult<T> {
+    Data: T[],
+    NumberOfPages: number,
+    TotalRecords: number,
+    RecordsPerPage: number
+}
+
 export const useBoundPaging = (currentPage: number, totalPages: number, setPage: (number) => void): void => {
     React.useEffect(() => {
         if (currentPage >= totalPages && totalPages > 0) {
@@ -43,7 +49,47 @@ export const useBoundPaging = (currentPage: number, totalPages: number, setPage:
 
 }
 
-export function useControllerFetch<T,>(controller: GenericController<T>, sortField?: keyof T, ascending?: boolean, parentID?: string|number, refreshCount?: number,) {
+export function usePagedSearch<T,>(controller: GenericController<T>, filters: Search.IFilter<T>[], page: number, sortField?: keyof T, ascending?: boolean, parentID?: string | number, refreshCount?: number) {
+
+    const [pagedData, setPagedData] = React.useState<T[]>([]);
+    const [pagedStatus, setPagedStatus] = React.useState<Application.Types.Status>('uninitiated');
+    const [totalPages, setTotalPages] = React.useState<number>(0);
+    const [totalRecords, setTotalRecords] = React.useState<number>(0);
+    const [recordsPerPage, setRecordsPerPage] = React.useState<number>(0);
+    const sortKey = sortField ?? controller.DefaultSort;
+    const asc = ascending ?? controller.Ascending;
+
+    const refetchData = React.useCallback(() => {
+        setPagedStatus('loading');
+
+        const handle = controller.PagedSearch(filters, sortKey, asc, page, parentID)
+            .done((data: IPagedResult<T>) => {
+                setPagedData(JSON.parse(data.Data as unknown as string));
+                setTotalPages(data.NumberOfPages);
+                setTotalRecords(data.TotalRecords);
+                setRecordsPerPage(data.RecordsPerPage);
+                setPagedStatus('idle');
+            })
+            .fail(() => setPagedStatus('error')); 
+
+        return () => { if (handle != null && handle.abort != null) handle.abort() }
+
+    }, [controller, filters, sortKey, asc, page, parentID])
+
+    React.useEffect(() => {
+        return refetchData();
+    }, [refetchData, refreshCount])
+
+    return {
+        Data: pagedData,
+        Status: pagedStatus,
+        TotalPages: totalPages,
+        TotalRecords: totalRecords,
+        RecordsPerPage: recordsPerPage
+    }
+}
+
+export function useControllerFetch<T,>(controller: GenericController<T>, sortField?: keyof T, ascending?: boolean, parentID?: string|number, refreshCount?: number) {
 
     const fetchHandle = React.useRef<JQuery.jqXHR<T[]> | null>(null);
     const [fetchData, setFetchData] = React.useState<T[]>([]);
@@ -75,4 +121,41 @@ export function useControllerFetch<T,>(controller: GenericController<T>, sortFie
         Data: fetchData,
         Status: fetchStatus
     }
-} 
\ No newline at end of file
+} 
+
+export function useGetOne<T,>(apiPath: string, recordID: string|number, refreshCount?: number) {
+    const [record, setRecord] = React.useState<T | null>(null);
+    const [recordStatus, setRecordStatus] = React.useState<Application.Types.Status>('uninitiated');
+
+    const refetchData = React.useCallback(() => {
+        setRecordStatus('loading');
+
+        const handle = $.ajax({
+            type: "GET",
+            url: apiPath + recordID.toString(),
+            contentType: "application/json; charset=utf-8",
+            dataType: 'json',
+            cache: true,
+            async: true
+        })
+            .done((record: T) => {
+                setRecord(record);
+                setRecordStatus('idle');
+            })
+            .fail(() => setRecordStatus('error'))
+
+        return () => {
+            if (handle != null && handle.abort != null) handle.abort();
+        }
+        
+    }, [apiPath, recordID])
+
+    React.useEffect(() => {
+        return refetchData();
+    }, [refetchData, refreshCount])
+
+    return {
+        Data: record,
+        Status: recordStatus
+    }
+}
\ No newline at end of file