diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..776d522
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+; Top-most EditorConfig file
+root = true
+
+; 4-column space indentation
+[*.cs]
+indent_style = space
+indent_size = 4
+tab_width = 4
diff --git a/.gitignore b/.gitignore
index 409184b..558766c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,16 @@
-.svn
\ No newline at end of file
+.svn/
+.vs/
+*/obj/
+*/bin/
+**/packages/
+QBFunctionTest/TestConfigs.xml
+TestResults/
+*.CodeAnalysisLog.xml
+*.ruleset
+*.lastcodeanalysissucceeded
+*.suo
+*.cache
+*.orig
+*.bak
+/License.log
+/Intuit.QuickBase.sln.DotSettings.user
diff --git a/Intuit.QuickBase.Client/ComparisonOperator.cs b/Intuit.QuickBase.Client/ComparisonOperator.cs
index 7d5523a..7d0c24f 100644
--- a/Intuit.QuickBase.Client/ComparisonOperator.cs
+++ b/Intuit.QuickBase.Client/ComparisonOperator.cs
@@ -68,6 +68,14 @@ public enum ComparisonOperator
         ///<summary>
         /// Is greater than or equal to
         ///</summary>
-        GTE
+        GTE,
+        /// <summary>
+        /// Is in range
+        /// </summary>
+        IR,
+        /// <summary>
+        /// Is not in range
+        /// </summary>
+        XIR
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Client/IQApplication.cs b/Intuit.QuickBase.Client/IQApplication.cs
index 2b8c9a0..1b43931 100644
--- a/Intuit.QuickBase.Client/IQApplication.cs
+++ b/Intuit.QuickBase.Client/IQApplication.cs
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System.Collections.Generic;
-using System.Xml.XPath;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Client
 {
@@ -18,7 +18,7 @@ public interface IQApplication
         IQClient Client { get; }
         void Disconnect();
         AppInfo GetApplicationInfo();
-        XPathDocument GetApplicationSchema();
+        XElement GetApplicationSchema();
         string CloneApplication(string qbNewName, string qbNewDescription, CloneData cloneData);
         void RenameApplication(string qbNewName);
         void DeleteApplication();
diff --git a/Intuit.QuickBase.Client/IQColumn.cs b/Intuit.QuickBase.Client/IQColumn.cs
index 12f3980..d53b4fa 100644
--- a/Intuit.QuickBase.Client/IQColumn.cs
+++ b/Intuit.QuickBase.Client/IQColumn.cs
@@ -5,6 +5,10 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
+
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Security.AccessControl;
 using Intuit.QuickBase.Core;
 
 namespace Intuit.QuickBase.Client
@@ -14,9 +18,26 @@ public interface IQColumn
         int ColumnId { get; set; }
         string ColumnName { get; set; }
         FieldType ColumnType { get; set; }
+        string ColumnRole { get; set; }
+        bool ColumnVirtual { get; set; }
+        bool ColumnSummary { get; set; }
+        bool IsHidden { get; set; }
+        bool ColumnLookup { get; set; }
+        bool AllowHTML { get; set; }
+        bool CanAddChoices { get; set; }
+        string CurrencySymbol { get; set; }
         bool Equals(IQColumn column);
         bool Equals(object obj);
         int GetHashCode();
         string ToString();
+        List<object> GetChoices();
+        void AddChoice(object obj);
+    }
+
+    internal interface IQColumn_int
+    {
+        void AcceptChanges(IQApplication Application, string tbid);
+        void AddChoice(object obj, bool onServer);
+        Dictionary<string,int> GetComposites(); 
     }
 }
diff --git a/Intuit.QuickBase.Client/IQRecord.cs b/Intuit.QuickBase.Client/IQRecord.cs
index 022d44a..99c27a4 100644
--- a/Intuit.QuickBase.Client/IQRecord.cs
+++ b/Intuit.QuickBase.Client/IQRecord.cs
@@ -11,15 +11,25 @@ public interface IQRecord
     {
         int RecordId { get; }
         RecordState RecordState { get; }
+        bool UncleanState { get; }
         bool IsOnServer { get; }
-        string this[int index] { get; set; }
-        string this[string columnName] { get; set; }
+        object this[int index] { get; set; }
+        object this[string columnName] { get; set; }
         void AcceptChanges();
+        void UploadFile(string columnName, string filePath);
         void DownloadFile(string columnName, string path, int versionId);
         void ChangeOwnerTo(string newOwner);
+        string GetAsCSV(string clist);
         bool Equals(IQRecord record);
         bool Equals(object obj);
         int GetHashCode();
         string ToString();
     }
+
+    internal interface IQRecord_int
+    {
+        void ForceUpdateState(int recId);
+        void ForceUpdateState();
+        int GetColumnIndex(string colName);
+    }
 }
diff --git a/Intuit.QuickBase.Client/IQTable.cs b/Intuit.QuickBase.Client/IQTable.cs
index 23bd74a..5c595c4 100644
--- a/Intuit.QuickBase.Client/IQTable.cs
+++ b/Intuit.QuickBase.Client/IQTable.cs
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Client
 {
@@ -13,27 +13,39 @@ public interface IQTable
     {
         string TableName { get; }
         string TableId { get; }
+        int KeyFID { get; }
+        int KeyCIdx { get; }
         QRecordCollection Records { get; }
         QColumnCollection Columns { get; }
         void Clear();
+        string GenCsv();
         string GenCsv(int queryId);
-        XPathDocument GetTableSchema();
+        string GenCsv(Query query);
+        string GenHtml(string options = "", string colList = "a");
+        string GenHtml(int queryId, string options = "", string colList = "a");
+        string GenHtml(Query query, string options = "", string colList = "a");
+        XElement GetTableSchema();
         TableInfo GetTableInfo();
         int GetServerRecordCount();
-        void Query();
-        void Query(int[] clist);
-        void Query(int[] clist, string options);
-        void Query(Query query);
-        void Query(Query query, int[] clist);
-        void Query(Query query, int[] clist, int[] slist);
-        void Query(Query query, int[] clist, int[] slist, string options);
-        void Query(int queryId);
+        void Query(bool clearRecords = true);
+        void Query(string options, bool clearRecords = true);
+        void Query(int[] colList, bool clearRecords = true);
+        void Query(int[] colList, string options, bool clearRecords = true);
+        void Query(Query query, bool clearRecords = true);
+        void Query(Query query, string options, bool clearRecords = true);
+        void Query(Query query, int[] colList, bool clearRecords = true);
+        void Query(Query query, int[] colList, int[] sortList, bool clearRecords = true);
+        void Query(Query query, int[] colList, int[] sortList, string options, bool clearRecords = true);
+        void Query(int queryId, bool clearRecords = true);
+        void Query(int queryId, string options, bool clearRecords = true);
         int QueryCount(Query query);
         int QueryCount(int queryId);
         void PurgeRecords();
         void PurgeRecords(int queryId);
+        void PurgeRecords(Query query);
         void AcceptChanges();
         IQRecord NewRecord();
+        void RefreshColumns();
         string ToString();
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Client/Intuit.QuickBase.Client.csproj b/Intuit.QuickBase.Client/Intuit.QuickBase.Client.csproj
index ede0358..b478f94 100644
--- a/Intuit.QuickBase.Client/Intuit.QuickBase.Client.csproj
+++ b/Intuit.QuickBase.Client/Intuit.QuickBase.Client.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,12 +11,21 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Intuit.QuickBase.Client</RootNamespace>
     <AssemblyName>Intuit.QuickBase.Client</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -25,6 +35,9 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,8 +46,11 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet />
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -64,6 +80,7 @@
     <Compile Include="IQTable.cs" />
     <Compile Include="LogicalOperator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="QAddress.cs" />
     <Compile Include="QApplication.cs" />
     <Compile Include="QApplicationFactory.cs" />
     <Compile Include="QApplicationFactoryBase.cs" />
@@ -100,7 +117,22 @@
       <Name>Intuit.QuickBase.Core</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Intuit.QuickBase.Client/QAddress.cs b/Intuit.QuickBase.Client/QAddress.cs
new file mode 100644
index 0000000..a09b40e
--- /dev/null
+++ b/Intuit.QuickBase.Client/QAddress.cs
@@ -0,0 +1,26 @@
+namespace Intuit.QuickBase.Client
+{
+    public class QAddress
+    {
+        public string Line1 { get; set; }
+        public string Line2 { get; set; }
+        public string City { get; set; }
+        public string Province { get; set; }
+        public string PostalCode { get; set; }
+        public string Country { get; set; }
+
+        public QAddress(string line1, string line2, string city, string province, string postCode, string country)
+        {
+            Line1 = line1;
+            Line2 = line2;
+            City = city;
+            Province = province;
+            PostalCode = postCode;
+            Country = country;
+        }
+
+        public QAddress()
+        {
+        }
+    }
+}
diff --git a/Intuit.QuickBase.Client/QApplication.cs b/Intuit.QuickBase.Client/QApplication.cs
index d306557..7360f6c 100644
--- a/Intuit.QuickBase.Client/QApplication.cs
+++ b/Intuit.QuickBase.Client/QApplication.cs
@@ -7,7 +7,7 @@
  */
 using System;
 using System.Collections.Generic;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core;
 using Intuit.QuickBase.Core.Exceptions;
 
@@ -42,7 +42,7 @@ internal QApplication(QTableFactoryBase tableFactory, IQClient client, string ap
         public string ApplicationId { get; private set; }
         public string ApplicationName { get; private set; }
         public string Token { get; private set; }
-        private QTableFactoryBase TableFactory { get; set; }
+        private QTableFactoryBase TableFactory { get; }
 
         // Methods
         public void Disconnect()
@@ -56,37 +56,37 @@ public void Disconnect()
 
         public AppInfo GetApplicationInfo()
         {
-            var getDbInfo = new GetDbInfo(Client.Ticket, Token, Client.AccountDomain, ApplicationId);
-            var xml = getDbInfo.Post().CreateNavigator();
-
-            var dbName = xml.SelectSingleNode("/qdbapi/dbname").Value;
-            var lastRecModTime = long.Parse(xml.SelectSingleNode("/qdbapi/lastRecModTime").Value);
-            var lastModifiedTime = long.Parse(xml.SelectSingleNode("/qdbapi/lastModifiedTime").Value);
-            var createTime = long.Parse(xml.SelectSingleNode("/qdbapi/createdTime").Value);
-            var numRecords = int.Parse(xml.SelectSingleNode("/qdbapi/numRecords").Value);
-            var mgrId = xml.SelectSingleNode("/qdbapi/mgrID").Value;
-            var mgrName = xml.SelectSingleNode("/qdbapi/mgrName").Value;
-            var version = xml.SelectSingleNode("/qdbapi/version").Value;
+            GetDbInfo getDbInfo = new GetDbInfo(Client.Ticket, Token, Client.AccountDomain, ApplicationId);
+            XElement xml = getDbInfo.Post();
+
+            string dbName = xml.Element("dbname").Value;
+            long lastRecModTime = long.Parse(xml.Element("lastRecModTime").Value);
+            long lastModifiedTime = long.Parse(xml.Element("lastModifiedTime").Value);
+            long createTime = long.Parse(xml.Element("createdTime").Value);
+            int numRecords = int.Parse(xml.Element("numRecords").Value);
+            string mgrId = xml.Element("mgrID").Value;
+            string mgrName = xml.Element("mgrName").Value;
+            string version = xml.Element("version").Value;
 
             return new AppInfo(dbName, lastRecModTime, lastModifiedTime, createTime, numRecords, mgrId, mgrName,
                                     version);
         }
 
-        public XPathDocument GetApplicationSchema()
+        public XElement GetApplicationSchema()
         {
             return GetApplicationSchema(Client.ClientUserName, Client.ClientPassword, Client.AccountDomain);
         }
 
-        private XPathDocument GetApplicationSchema(string username, string password, string accountDomain)
+        private XElement GetApplicationSchema(string username, string password, string accountDomain)
         {
-            var signin = new Authenticate(username, password, accountDomain, 1);
-            var xml = signin.Post().CreateNavigator();
-            var adminTicket = xml.SelectSingleNode("/qdbapi/ticket").Value;
+            Authenticate signin = new Authenticate(username, password, accountDomain, 1);
+            XElement xml = signin.Post();
+            string adminTicket = xml.Element("ticket").Value;
 
-            var appSchema = new GetSchema(adminTicket, Token, accountDomain, ApplicationId);
-            var xmlSchema = appSchema.Post();
+            GetSchema appSchema = new GetSchema(adminTicket, Token, accountDomain, ApplicationId);
+            XElement xmlSchema = appSchema.Post();
 
-            var signout = new SignOut(accountDomain);
+            SignOut signout = new SignOut(accountDomain);
             signout.Post();
 
             return xmlSchema;
@@ -94,17 +94,17 @@ private XPathDocument GetApplicationSchema(string username, string password, str
 
         public string CloneApplication(string qbNewName, string qbNewDescription, CloneData cloneData)
         {
-            var cloneApp = new CloneDatabase.Builder(Client.Ticket, Token, Client.AccountDomain, ApplicationId, qbNewName, qbNewDescription)
+            CloneDatabase cloneApp = new CloneDatabase.Builder(Client.Ticket, Token, Client.AccountDomain, ApplicationId, qbNewName, qbNewDescription)
                 .SetKeepData(Convert.ToBoolean(cloneData))
                 .Build();
-            var xml = cloneApp.Post().CreateNavigator();
+            XElement xml = cloneApp.Post();
 
-            return xml.SelectSingleNode("/qdbapi/newdbid").Value;
+            return xml.Element("newdbid").Value;
         }
 
         public void RenameApplication(string qbNewName)
         {
-            var renameApp = new RenameApp(Client.Ticket, Token, Client.AccountDomain, ApplicationId, qbNewName);
+            RenameApp renameApp = new RenameApp(Client.Ticket, Token, Client.AccountDomain, ApplicationId, qbNewName);
             renameApp.Post();
 
             ApplicationName = qbNewName;
@@ -112,7 +112,7 @@ public void RenameApplication(string qbNewName)
 
         public void DeleteApplication()
         {
-            var deleteApp = new DeleteDatabase(Client.Ticket, Token, Client.AccountDomain, ApplicationId);
+            DeleteDatabase deleteApp = new DeleteDatabase(Client.Ticket, Token, Client.AccountDomain, ApplicationId);
             deleteApp.Post();
 
             Token = null;
@@ -123,36 +123,36 @@ public void DeleteApplication()
 
         public UserInfo GetUserInfo(string email)
         {
-            var getUserInfo = new GetUserInfo(Client.Ticket, Token, Client.AccountDomain, email);
-            var xml = getUserInfo.Post().CreateNavigator();
-            var userId = xml.SelectSingleNode("/qdbapi/user").GetAttribute("id", String.Empty);
-            var firstName = xml.SelectSingleNode("/qdbapi/user/firstName").Value;
-            var lastName = xml.SelectSingleNode("/qdbapi/user/lastName").Value;
-            var login = xml.SelectSingleNode("/qdbapi/user/login").Value;
-            var emailAddress = xml.SelectSingleNode("/qdbapi/user/email").Value;
-            var screenName = xml.SelectSingleNode("/qdbapi/user/screenName").Value;
+            GetUserInfo getUserInfo = new GetUserInfo(Client.Ticket, Token, Client.AccountDomain, email);
+            XElement xml = getUserInfo.Post();
+            XElement userElm = xml.Element("user");
+            string userId = xml.Element("user").Attribute("id").Value;
+            string firstName = userElm.Element("firstName").Value;
+            string lastName = userElm.Element("lastName").Value;
+            string login = userElm.Element("login").Value;
+            string emailAddress = userElm.Element("email").Value;
+            string screenName = userElm.Element("screenName").Value;
             return new UserInfo(userId, firstName, lastName, login, emailAddress, screenName);
         }
 
         public UserRoleInfo GetUserRole(string userId)
         {
-            var getUserRole = new GetUserRole(Client.Ticket, Token, Client.AccountDomain, ApplicationId, userId);
-            var xml = getUserRole.Post().CreateNavigator();
-
+            GetUserRole getUserRole = new GetUserRole(Client.Ticket, Token, Client.AccountDomain, ApplicationId, userId);
+            XElement xml = getUserRole.Post();
+            XElement userElm = xml.Element("user");
             // User info
-            var returnedUserId = xml.SelectSingleNode("/qdbapi/user").GetAttribute("id", String.Empty);
-            var name = xml.SelectSingleNode("/qdbapi/user/name").Value;
-            var userRoleInfo = new UserRoleInfo(returnedUserId, name);
+            string returnedUserId = userElm.Attribute("id").Value;
+            string name = userElm.Element("name").Value;
+            UserRoleInfo userRoleInfo = new UserRoleInfo(returnedUserId, name);
 
             // Role info
-            var roleNodes = xml.Select("/qdbapi/user/roles/role");
-            foreach (XPathNavigator node in roleNodes)
+            foreach (XElement node in userElm.Element("roles").Elements("role"))
             {
-                var roleId = int.Parse(node.GetAttribute("id", String.Empty));
-                var roleName = node.SelectSingleNode("name").Value;
-                var accessNode = node.SelectSingleNode("access");
-                var roleAccessId = int.Parse(accessNode.GetAttribute("id", String.Empty));
-                var roleAccess = accessNode.Value;
+                int roleId = int.Parse(node.Attribute("id").Value);
+                string roleName = node.Element("name").Value;
+                XElement accessNode = node.Element("access");
+                int roleAccessId = int.Parse(accessNode.Attribute("id").Value);
+                string roleAccess = accessNode.Value;
                 userRoleInfo.AddRole(roleId, roleName, roleAccessId, roleAccess);
             }
             return userRoleInfo;
@@ -160,27 +160,25 @@ public UserRoleInfo GetUserRole(string userId)
 
         public List<UserRoleInfo> UserRoles()
         {
-            var userRoles = new UserRoles(Client.Ticket, Token, Client.AccountDomain, ApplicationId);
-            var xml = userRoles.Post().CreateNavigator();
-            var userRoleInfos = new List<UserRoleInfo>();
+            UserRoles userRoles = new UserRoles(Client.Ticket, Token, Client.AccountDomain, ApplicationId);
+            XElement xml = userRoles.Post();
+            List<UserRoleInfo> userRoleInfos = new List<UserRoleInfo>();
 
-            var userNodes = xml.Select("/qdbapi/users/user");
-            foreach (XPathNavigator user in userNodes)
+            foreach (XElement user in xml.Element("users").Elements("user"))
             {
                 // User info
-                var userId = user.GetAttribute("id", String.Empty);
-                var name = user.SelectSingleNode("name").Value;
-                var userRoleInfo = new UserRoleInfo(userId, name);
+                string userId = user.Attribute("id").Value;
+                string name = user.Element("name").Value;
+                UserRoleInfo userRoleInfo = new UserRoleInfo(userId, name);
 
                 // Role info
-                var roleNodes = user.Select("roles/role");
-                foreach (XPathNavigator node in roleNodes)
+                foreach (XElement node in user.Element("roles").Elements("role"))
                 {
-                    var roleId = int.Parse(node.GetAttribute("id", String.Empty));
-                    var roleName = node.SelectSingleNode("name").Value;
-                    var accessNode = node.SelectSingleNode("access");
-                    var roleAccessId = int.Parse(accessNode.GetAttribute("id", String.Empty));
-                    var roleAccess = accessNode.Value;
+                    int roleId = int.Parse(node.Attribute("id").Value);
+                    string roleName = node.Element("name").Value;
+                    XElement accessNode = node.Element("access");
+                    int roleAccessId = int.Parse(accessNode.Attribute("id").Value);
+                    string roleAccess = accessNode.Value;
                     userRoleInfo.AddRole(roleId, roleName, roleAccessId, roleAccess);
                 }
                 userRoleInfos.Add(userRoleInfo);
@@ -190,19 +188,19 @@ public List<UserRoleInfo> UserRoles()
 
         public IQTable NewTable(string tableName, string pNoun)
         {
-            var table = TableFactory.CreateInstance(this, tableName, pNoun);
+            IQTable table = TableFactory.CreateInstance(this, tableName, pNoun);
             _qbDataTables.Add(table.TableId, table);
             return table;
         }
 
         public void DeleteTable(IQTable table)
         {
-            var tableId = table.TableId;
+            string tableId = table.TableId;
             if (!_qbDataTables.ContainsKey(tableId))
             {
                 throw new TableDoesNotExistInQuickBase("Table does not exist in this instance of QApplication.");
             }
-            var deleteTbl = new DeleteDatabase(Client.Ticket, Token, Client.AccountDomain, tableId);
+            DeleteDatabase deleteTbl = new DeleteDatabase(Client.Ticket, Token, Client.AccountDomain, tableId);
             deleteTbl.Post();
 
             _qbDataTables.Remove(tableId);
@@ -210,7 +208,13 @@ public void DeleteTable(IQTable table)
 
         public IQTable GetTable(string dbid)
         {
-            return _qbDataTables.ContainsKey(dbid) ? _qbDataTables[dbid] : null;
+            QTable tbl = (QTable)(_qbDataTables.ContainsKey(dbid) ? _qbDataTables[dbid] : null);
+            if (tbl == null)
+            {
+                throw new TableDoesNotExistInQuickBase("Table does not exist in this instance of QApplication.");
+            }
+            if (!tbl.IsLoaded) tbl.Load();
+            return tbl;
         }
 
         public Dictionary<string, IQTable> GetTables()
@@ -225,26 +229,25 @@ public AppDtm GetApplicationDataTimeInfo()
 
         internal static AppDtm GetApplicationDataTimeInfo(string accountDomain, string applicationId)
         {
-            var getAppDtmInfo = new GetAppDtmInfo(accountDomain, applicationId);
-            var xml = getAppDtmInfo.Get().CreateNavigator();
+            GetAppDtmInfo getAppDtmInfo = new GetAppDtmInfo(accountDomain, applicationId);
+            XElement xml = getAppDtmInfo.Get();
 
             // Request info
-            var requestTime = long.Parse(xml.SelectSingleNode("/qdbapi/RequestTime").Value);
-            var requestNextAllowedTime = long.Parse(xml.SelectSingleNode("/qdbapi/RequestNextAllowedTime").Value);
+            long requestTime = long.Parse(xml.Element("RequestTime").Value);
+            long requestNextAllowedTime = long.Parse(xml.Element("RequestNextAllowedTime").Value);
             // App info
-            var appNode = xml.SelectSingleNode("/qdbapi/app");
-            var appDbid = appNode.GetAttribute("id", String.Empty);
-            var appLastModifiedTime = long.Parse(appNode.SelectSingleNode("lastModifiedTime").Value);
-            var appLastRecModTime = long.Parse(appNode.SelectSingleNode("lastRecModTime").Value);
-            var appDtmInfo = new AppDtm(appDbid, appLastModifiedTime, appLastRecModTime, requestTime, requestNextAllowedTime);
+            XElement appNode = xml.Element("app");
+            string appDbid = appNode.Attribute("id").Value;
+            long appLastModifiedTime = long.Parse(appNode.Element("lastModifiedTime").Value);
+            long appLastRecModTime = long.Parse(appNode.Element("lastRecModTime").Value);
+            AppDtm appDtmInfo = new AppDtm(appDbid, appLastModifiedTime, appLastRecModTime, requestTime, requestNextAllowedTime);
 
             // Table info
-            var tableNodes = xml.Select("/qdbapi/tables/table");
-            foreach (XPathNavigator node in tableNodes)
+            foreach (XElement node in xml.Element("tables").Elements("table"))
             {
-                var tableId = node.GetAttribute("id", String.Empty);
-                var tableLastModifiedTime = long.Parse(node.SelectSingleNode("lastModifiedTime").Value);
-                var tableLastRecModTime = long.Parse(node.SelectSingleNode("lastRecModTime").Value);
+                string tableId = node.Attribute("id").Value;
+                long tableLastModifiedTime = long.Parse(node.Element("lastModifiedTime").Value);
+                long tableLastRecModTime = long.Parse(node.Element("lastRecModTime").Value);
                 appDtmInfo.AddTable(tableId, tableLastModifiedTime, tableLastRecModTime);
             }
             return appDtmInfo;
@@ -252,27 +255,26 @@ internal static AppDtm GetApplicationDataTimeInfo(string accountDomain, string a
 
         public List<GrantedAppsInfo> GrantedDBs()
         {
-            var grantedDBs = new GrantedDBs.Builder(Client.Ticket, Token, Client.AccountDomain)
+            GrantedDBs grantedDBs = new GrantedDBs.Builder(Client.Ticket, Token, Client.AccountDomain)
                 .SetWithEmbeddedTables(true).Build();
-            var xml = grantedDBs.Post().CreateNavigator();
+            XElement xml = grantedDBs.Post();
 
-            var dbinfoNodes = xml.Select("/qdbapi/databases/dbinfo");
             GrantedAppsInfo grantedApps = null;
-            var grantedAppsInfos = new List<GrantedAppsInfo>();
-            foreach (XPathNavigator dbinfo in dbinfoNodes)
+            List<GrantedAppsInfo> grantedAppsInfos = new List<GrantedAppsInfo>();
+            foreach (XElement dbinfo in xml.Element("databases").Elements("dbinfo"))
             {
-                if (!dbinfo.SelectSingleNode("dbname").Value.Contains(":"))
+                if (!dbinfo.Element("dbname").Value.Contains(":"))
                 {
-                    var appName = dbinfo.SelectSingleNode("dbname").Value;
-                    var appDbid = dbinfo.SelectSingleNode("dbid").Value;
+                    string appName = dbinfo.Element("dbname").Value;
+                    string appDbid = dbinfo.Element("dbid").Value;
                     grantedApps = new GrantedAppsInfo(appName, appDbid);
                     grantedAppsInfos.Add(grantedApps);
                 }
                 else
                 {
-                    var tableName = dbinfo.SelectSingleNode("dbname").Value;
-                    var tableDbid = dbinfo.SelectSingleNode("dbid").Value;
-                    if (grantedApps != null) grantedApps.AddTable(tableName, tableDbid);
+                    string tableName = dbinfo.Element("dbname").Value;
+                    string tableDbid = dbinfo.Element("dbid").Value;
+                    grantedApps?.AddTable(tableName, tableDbid);
                 }
             }
             return grantedAppsInfos;
@@ -285,15 +287,14 @@ public override string ToString()
 
         internal void LoadTables()
         {
-            var xmlApp = GetApplicationSchema(Client.AdminUserName, Client.AdminPassword, Client.AccountDomain).CreateNavigator();
-            var nodes = xmlApp.Select("/qdbapi/table/chdbids/chdbid");
-            foreach (XPathNavigator node in nodes)
+            XElement xmlApp = GetApplicationSchema(Client.AdminUserName, Client.AdminPassword, Client.AccountDomain);
+            foreach (XElement node in xmlApp.Element("table").Element("chdbids").Elements("chdbid"))
             {
-                var dbid = node.Value;
+                string dbid = node.Value;
 
                 try
                 {
-                    var qDataTable = TableFactory.CreateInstance(this, dbid);
+                    IQTable qDataTable = TableFactory.CreateInstanceLazy(this, dbid);
                     _qbDataTables.Add(qDataTable.TableId, qDataTable);
                 }
                 catch (InsufficientPermissionsException) { }
diff --git a/Intuit.QuickBase.Client/QApplicationFactory.cs b/Intuit.QuickBase.Client/QApplicationFactory.cs
index 4b01a78..e5e43e9 100644
--- a/Intuit.QuickBase.Client/QApplicationFactory.cs
+++ b/Intuit.QuickBase.Client/QApplicationFactory.cs
@@ -24,7 +24,7 @@ internal static QApplicationFactoryBase GetInstance()
 
         internal override IQApplication CreateInstance(IQClient client, string applicationId, string token)
         {
-            var tableFactory = QTableFactory.GetInstance();
+            QTableFactoryBase tableFactory = QTableFactory.GetInstance();
             return new QApplication(tableFactory, client, applicationId, token);
         }
     }
diff --git a/Intuit.QuickBase.Client/QClient.cs b/Intuit.QuickBase.Client/QClient.cs
index f2a0774..ed6f6ba 100644
--- a/Intuit.QuickBase.Client/QClient.cs
+++ b/Intuit.QuickBase.Client/QClient.cs
@@ -7,7 +7,7 @@
  */
 using System;
 using System.Collections.Generic;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core;
 
 namespace Intuit.QuickBase.Client
@@ -40,20 +40,20 @@ internal QClient(QApplicationFactoryBase applicationFactory, string clientUserNa
         public string AdminPassword { get; private set; }
         public string AccountDomain { get; private set; }
         public int Hours { get; private set; }
-        private QApplicationFactoryBase ApplicationFactory { get; set; }
+        private QApplicationFactoryBase ApplicationFactory { get; }
 
         private void Login()
         {
-            var signin = new Authenticate(ClientUserName, ClientPassword, AccountDomain, Hours);
-            var xml = signin.Post().CreateNavigator();
+            Authenticate signin = new Authenticate(ClientUserName, ClientPassword, AccountDomain, Hours);
+            XElement xml = signin.Post();
 
-            Ticket = xml.SelectSingleNode("/qdbapi/ticket").Value;
+            Ticket = xml.Element("ticket").Value;
         }
 
 
         public void Logout()
         {
-            var signout = new SignOut(AccountDomain);
+            SignOut signout = new SignOut(AccountDomain);
             signout.Post();
             Ticket = null;
             ClientUserName = null;
@@ -81,28 +81,27 @@ public void Disconnect(IQApplication application)
 
         public IQApplication CreateApplication(string qbName, string qbDescription, CreateApplicationToken createApplicationToken)
         {
-            var createToken = Convert.ToBoolean(createApplicationToken);
+            bool createToken = Convert.ToBoolean(createApplicationToken);
 
-            var createDb = new CreateDatabase(Ticket, AccountDomain, qbName, qbDescription, createToken);
-            var xml = createDb.Post().CreateNavigator();
+            CreateDatabase createDb = new CreateDatabase(Ticket, AccountDomain, qbName, qbDescription, createToken);
+            XElement xml = createDb.Post();
 
             string token = null;
             if (createToken)
             {
-                token = xml.SelectSingleNode("/qdbapi/apptoken").Value;
+                token = xml.Element("apptoken").Value;
             }
-            var applicationId = xml.SelectSingleNode("/qdbapi/appdbid").Value;
+            string applicationId = xml.Element("appdbid").Value;
             return Connect(applicationId, token);
         }
 
         public List<string> FindApplication(string qbName)
         {
-            var findDb = new FindDbByName(Ticket, AccountDomain, qbName);
-            var xml = findDb.Post().CreateNavigator();
+            FindDbByName findDb = new FindDbByName(Ticket, AccountDomain, qbName);
+            XElement xml = findDb.Post();
 
-            var nodes = xml.Select("/qdbapi/dbid");
-            var dbids = new List<string>();
-            foreach (XPathNavigator node in nodes)
+            List<string> dbids = new List<string>();
+            foreach (XElement node in xml.Elements("dbid"))
             {
                 dbids.Add(node.Value);
             }
diff --git a/Intuit.QuickBase.Client/QClientFactory.cs b/Intuit.QuickBase.Client/QClientFactory.cs
index 43b29b9..639571e 100644
--- a/Intuit.QuickBase.Client/QClientFactory.cs
+++ b/Intuit.QuickBase.Client/QClientFactory.cs
@@ -24,7 +24,7 @@ internal static QClientFactoryBase GetInstance()
 
         internal override IQClient CreateInstance(string clientUserName, string clientPassword, string adminUserName, string adminPassword, string accountDomain, int hours)
         {
-            var applicationFactory = QApplicationFactory.GetInstance();
+            QApplicationFactoryBase applicationFactory = QApplicationFactory.GetInstance();
             return new QClient(applicationFactory, clientUserName, clientPassword, adminUserName, adminPassword, accountDomain, hours);
         }
     }
diff --git a/Intuit.QuickBase.Client/QColumn.cs b/Intuit.QuickBase.Client/QColumn.cs
index 859c2b1..2f58b94 100644
--- a/Intuit.QuickBase.Client/QColumn.cs
+++ b/Intuit.QuickBase.Client/QColumn.cs
@@ -5,16 +5,37 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core;
+using Intuit.QuickBase.Core.Exceptions;
 
 namespace Intuit.QuickBase.Client
 {
-    public class QColumn : IQColumn
+    public class QColumn : IQColumn, IQColumn_int
     {
+        internal class Choice
+        {
+            public object value;
+            public bool inServer;
+
+            internal Choice(object obj, bool inServ)
+            {
+                value = obj;
+                inServer = inServ;
+            }
+        }
+
         // Constructors
-        internal QColumn() { }
+        internal QColumn()
+        {
+            choices = new List<Choice>();
+            composites = new Dictionary<string, int>();
+        }
 
-        public QColumn(string columnName, FieldType columnType)
+        public QColumn(string columnName, FieldType columnType) : this()
         {
             ColumnName = columnName;
             ColumnType = columnType;
@@ -26,22 +47,45 @@ internal QColumn(int columnId, string columnName, FieldType columnType)
             ColumnId = columnId;
         }
 
+        internal QColumn(int columnId, string columnName, FieldType columnType, string columnRole, bool columnVirtual, bool columnLookup, bool columnSummary, bool isHidden, bool allowHTML, bool canAddChoices)
+            : this(columnName, columnType)
+        {
+            ColumnVirtual = columnVirtual;
+            ColumnLookup = columnLookup;
+            ColumnSummary = columnSummary;
+            ColumnRole = columnRole;
+            AllowHTML = allowHTML;
+            CanAddChoices = canAddChoices;
+            IsHidden = isHidden;
+            ColumnId = columnId;
+        }
+
         // Properties
         public int ColumnId { get; set; }
         public string ColumnName { get; set; }
         public FieldType ColumnType { get; set; }
+        public string ColumnRole { get; set; }
+        public bool ColumnVirtual { get; set; }
+        public bool ColumnSummary { get; set; }
+        public bool CanAddChoices { get; set; }
+        public bool IsHidden { get; set; }
+        public bool AllowHTML { get; set; }
+        public bool ColumnLookup { get; set; }
+        internal List<Choice> choices;
+        internal Dictionary<string,int> composites; 
+        public string CurrencySymbol { get; set; }
 
         // Methods
         public bool Equals(IQColumn column)
         {
-            if (ReferenceEquals(null, column)) return false;
+            if (column is null) return false;
             if (ReferenceEquals(this, column)) return true;
             return Equals(column.ColumnName, ColumnName);
         }
 
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != typeof (QColumn)) return false;
             return Equals((IQColumn) obj);
@@ -49,12 +93,104 @@ public override bool Equals(object obj)
 
         public override int GetHashCode()
         {
-            return (ColumnName != null ? ColumnName.GetHashCode() : 0);
+            return ColumnName != null ? ColumnName.GetHashCode() : 0;
         }
 
         public override string ToString()
         {
             return ColumnName;
         }
+
+        public List<object> GetChoices()
+        {
+            List<object> retVal = new List<object>(choices.Count);
+            foreach (Choice ch in choices)
+                retVal.Add(ch.value);
+            return retVal;
+        }
+
+        public void AddChoice(object obj)
+        {
+            AddChoice(obj, false);
+        }
+
+        public void AddChoice(object obj, bool inServer)
+        {
+            Choice ch;
+            switch (ColumnType)
+            {
+                case FieldType.multitext:
+                    if (obj is string multiChoice)
+                    {
+                        if (!CanAddChoices && !inServer)
+                        {
+                            throw new InvalidChoiceException($"Column {ColumnName} does not allow adding new choices.");
+                        }
+                        if (multiChoice.Length > 60)
+                        {
+                            throw new InvalidChoiceException($"Column {ColumnName} presented with new choice that is longer than 60 characters");
+                        }
+                        if (choices == null)
+                        {
+                            throw new InvalidChoiceException($"Column {ColumnName} presented with new choice when field not setup for choices");
+                        }
+                        if (choices.Count > 100 && !inServer)
+                        {
+                            throw new InvalidChoiceException($"Column {ColumnName} presented with new choice that would bring total # of choices over 100");
+                        }
+                        ch = new Choice(multiChoice, inServer);
+                        choices.Add(ch);
+                    }
+                    else
+                    {
+                        throw new InvalidChoiceException($"Column {ColumnName} presented with invalid type");
+                    }
+                    break;
+                case FieldType.text:
+                    if (obj is string newChoice)
+                    {
+                        if (!CanAddChoices && !inServer)
+                        {
+                            throw new InvalidChoiceException($"Column {ColumnName} does not allow adding new choices.");
+                        }
+                        if (choices == null)
+                        {
+                            throw new InvalidChoiceException($"Column {ColumnName} presented with new choice when field not setup for choices");
+                        }
+                        ch = new Choice(newChoice, inServer);
+                        choices.Add(ch);
+                    }
+                    else
+                    {
+                        throw new InvalidChoiceException($"Column {ColumnName} presented with invalid type");
+                    }
+                    break;
+                default:
+                    throw new InvalidChoiceException($"Column {ColumnName} does not support choices.");
+            }
+        }
+
+        public Dictionary<string,int> GetComposites()
+        {
+            return composites;
+        }
+
+        public void AcceptChanges(IQApplication Application, string tbid)
+        {
+            if (ColumnSummary || ColumnVirtual || ColumnLookup || choices.All(c => c.inServer)) return;
+            
+            List<string> changeList = new List<string>(choices.Count(c => c.inServer == false));
+            foreach (Choice ch in choices)
+            {
+                if (!ch.inServer)
+                {
+                    changeList.Add(ch.value.ToString());
+                    ch.inServer = true;
+                }
+            }
+            FieldAddChoices fac = new FieldAddChoices(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, tbid, ColumnId, changeList);
+            XElement xml = fac.Post();
+            Http.CheckForException(xml);
+        }
     }
 }
diff --git a/Intuit.QuickBase.Client/QColumnCollection.cs b/Intuit.QuickBase.Client/QColumnCollection.cs
index 95cd626..af50f03 100644
--- a/Intuit.QuickBase.Client/QColumnCollection.cs
+++ b/Intuit.QuickBase.Client/QColumnCollection.cs
@@ -6,7 +6,9 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System.Collections.Generic;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core;
+using Intuit.QuickBase.Core.Exceptions;
 
 namespace Intuit.QuickBase.Client
 {
@@ -22,21 +24,40 @@ public QColumnCollection(IQApplication application, IQTable table)
         private IQApplication Application { get; set; }
         private IQTable Table { get; set; }
 
+        public IQColumn this[string columnName]
+        {
+            get
+            {
+                int index = base.IndexOf(new QColumn { ColumnName = columnName });
+                if (index == -1)
+                {
+                    throw new ColumnDoesNotExistInTableException($"Column '{columnName}' not found in table.");
+                }
+
+                return base[index];
+
+            }
+        }
+
+
         public new void Add(IQColumn column)
         {
             if (column.ColumnId == 0)
             {
-                var addCol = new AddField(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, Table.TableId, column.ColumnName, column.ColumnType);
-                var xml = addCol.Post().CreateNavigator();
-                var columnId = int.Parse(xml.SelectSingleNode("/qdbapi/fid").Value);
+                AddField addCol = new AddField(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, Table.TableId, column.ColumnName, column.ColumnType);
+                XElement xml = addCol.Post();
+                Http.CheckForException(xml);
+                int columnId = int.Parse(xml.Element("fid").Value);
                 column.ColumnId = columnId;
             }
+
+            if (column.ColumnType == FieldType.multitext) column.CanAddChoices = true;
             base.Add(column);
         }
 
         public new bool Remove(IQColumn column)
         {
-            var deleteField = new DeleteField(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, Table.TableId, column.ColumnId);
+            DeleteField deleteField = new DeleteField(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, Table.TableId, column.ColumnId);
             deleteField.Post();
             return base.Remove(column);
         }
diff --git a/Intuit.QuickBase.Client/QColumnFactory.cs b/Intuit.QuickBase.Client/QColumnFactory.cs
index 4b345ab..c687546 100644
--- a/Intuit.QuickBase.Client/QColumnFactory.cs
+++ b/Intuit.QuickBase.Client/QColumnFactory.cs
@@ -24,9 +24,9 @@ internal static QColumnFactoryBase GetInstance()
             return _instance;
         }
 
-        internal override IQColumn CreateInstace(int columnId, string columnName, FieldType columnType)
+        internal override IQColumn CreateInstance(int columnId, string columnName, FieldType columnType, string columnRole, bool columnVirtual, bool columnLookup, bool columnSummary, bool ishidden, bool allowHTML, bool canAddChoices)
         {
-            return new QColumn(columnId, columnName, columnType);
+            return new QColumn(columnId, columnName, columnType, columnRole, columnVirtual, columnLookup, columnSummary, ishidden, allowHTML, canAddChoices);
         }
     }
 }
diff --git a/Intuit.QuickBase.Client/QColumnFactoryBase.cs b/Intuit.QuickBase.Client/QColumnFactoryBase.cs
index c4a4d2d..abc5f31 100644
--- a/Intuit.QuickBase.Client/QColumnFactoryBase.cs
+++ b/Intuit.QuickBase.Client/QColumnFactoryBase.cs
@@ -11,6 +11,6 @@ namespace Intuit.QuickBase.Client
 {
     internal abstract class QColumnFactoryBase
     {
-        internal abstract IQColumn CreateInstace(int columnId, string columnName, FieldType columnType);
+        internal abstract IQColumn CreateInstance(int columnId, string columnName, FieldType columnType, string columnRole, bool columnVirtual, bool columnLookup, bool columnSummary, bool isHidden, bool allowHTML, bool canAddChoices);
     }
 }
diff --git a/Intuit.QuickBase.Client/QField.cs b/Intuit.QuickBase.Client/QField.cs
index 1118320..9506376 100644
--- a/Intuit.QuickBase.Client/QField.cs
+++ b/Intuit.QuickBase.Client/QField.cs
@@ -6,67 +6,257 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using Intuit.QuickBase.Core;
+using Intuit.QuickBase.Core.Exceptions;
 
 namespace Intuit.QuickBase.Client
 {
     internal class QField
     {
+        private static readonly Regex CSVUncleanRegEx = new Regex(@"[\r\n]");
+        private static readonly DateTime TSOffset = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
         // Instance fields
-        private string _value;
+        private object _value;
 
         internal QField(int fieldId)
-            : this(fieldId, null, FieldType.empty, null)
+            : this(fieldId, null, FieldType.empty, null, null)
         {
         }
 
         // Constructors
-        internal QField(int fieldId, string value, FieldType type, IQRecord record)
+        internal QField(int fieldId, object value, FieldType type, IQRecord record, IQColumn column) : this(fieldId, value, type, record, column, false)
+        {
+        }
+
+        internal QField(int fieldId, object value, FieldType type, IQRecord record, IQColumn column,  bool QBinternal)
         {
             FieldId = fieldId;
             Type = type;
             Record = record; // needs to be before Value.
-            Value = value;
+            Column = column;
+            if (QBinternal)
+            {
+                QBValue = (string)value;
+            }
+            else
+            {
+                Value = value;
+            }
+            if (type == FieldType.text && value != null)
+                UncleanText = CSVUncleanRegEx.IsMatch((string)value);
+            else
+                UncleanText = false;
         }
 
         // Properties
         internal int FieldId { get; private set; }
-        internal string Value
+
+        //This gets around a bug in QB's uploadCSV api that will interpret certain characters as EndOfRecord even when surround by quotes
+        internal bool UncleanText { get; private set; }
+
+        internal string QBValue
         {
             get
             {
+                if (_value == null) return String.Empty;
+                switch (Type)
+                {
+                    case FieldType.address:
+                        return string.Empty;
+                    case FieldType.timestamp:
+                        return ConvertDateTimeToQBMilliseconds((DateTime)_value);
+                    case FieldType.date:
+                        return ConvertDateToQBMilliseconds((DateTime)_value);
+                    case FieldType.timeofday:
+                        return ConvertTimeSpanToQBTimeOfDay((TimeSpan)_value);
+                    case FieldType.duration:
+                        return ConvertTimeSpanToQBDuration((TimeSpan)_value);
+                    case FieldType.checkbox:
+                        return (bool)_value ? "1" : "0";
+                    case FieldType.multitext:
+                        return ConvertHashSetToQBMultiSelect((HashSet<int>)_value);
+                    default:
+                        return _value.ToString();
+                }
+            }
+            set
+            {
+                UncleanText = false;
                 switch (Type)
                 {
+                    case FieldType.address:
+                        // do nothing: child columns will fill this out
+                        break;
+                    case FieldType.date:
+                        _value = String.IsNullOrEmpty(value) ? new DateTime?() : ConvertQBMillisecondsToDate(value);
+                        break;
+                    case FieldType.timeofday:
+                        _value = String.IsNullOrEmpty(value) ? new TimeSpan?() : ConvertQBTimeOfDayToTime(value);
+                        break;
+                    case FieldType.duration:
+                        _value = String.IsNullOrEmpty(value) ? new TimeSpan?() : ConvertQBDurationToTimeSpan(value);
+                        break;
                     case FieldType.timestamp:
-                        return ConvertQBMillisecondsToDateTime(_value).ToString();
+                        _value = String.IsNullOrEmpty(value) ? new DateTime?() : ConvertQBMillisecondsToDateTime(value);
+                        break;
+                    case FieldType.checkbox:
+                        _value = String.IsNullOrEmpty(value) ? new bool?() : (value == "1" || value == "true");
+                        break;
+                    case FieldType.rating:
+                        _value = String.IsNullOrEmpty(value) ? new float?() : float.Parse(value);
+                        break;
+                    case FieldType.percent:
+                        _value = String.IsNullOrEmpty(value) ? new decimal?() : decimal.Parse(value) * 100; //get around roundtrip bug
+                        break;
+                    case FieldType.@float:
+                    case FieldType.currency:
+                        _value = String.IsNullOrEmpty(value) ? new decimal?() : decimal.Parse(value);
+                        break;
+                    case FieldType.recordid:
+                        _value = String.IsNullOrEmpty(value) ? new int?() : int.Parse(value);
+                        break;
+                    case FieldType.multitext:
+                        _value = String.IsNullOrEmpty(value) ? new HashSet<int>() : ConvertQBStringToHashSet(value);
+                        break;
+                    case FieldType.text:
+                        _value = value;
+                        UncleanText = CSVUncleanRegEx.IsMatch((string)value);
+                        break;
+                    default:
+                        _value = value;
+                        break;
+                }
+            }
+        }
+
+        internal object Value
+        {
+            get
+            {
+                switch (Type)
+                {
+                    case FieldType.address:
+                        Dictionary<string, int> colDict = ((IQColumn_int) Column).GetComposites();
+                        return new QAddress(
+                            (string)Record[colDict["street"]],
+                            (string)Record[colDict["street2"]],
+                            (string)Record[colDict["city"]],
+                            (string)Record[colDict["region"]],
+                            (string)Record[colDict["postal"]],
+                            (string)Record[colDict["country"]]
+                            );
                     default:
                         return _value;
                 }
             }
             set
             {
-                if (_value != null)
+                if (value == null)
+                {
+                    if (_value != null)
+                    {
+                        UncleanText = false;
+                        _value = null;
+                        Update = true;
+                    }
+                }
+                else
                 {
-                    Update = true;
+                    if (Column.ColumnSummary || Column.ColumnVirtual || Column.ColumnLookup)
+                        throw new ArgumentException("Cannot set values of lookup, summary or virtual fields.");
+                    if (_value == null || !_value.Equals(value))
+                    {
+                        UncleanText = false;
+                        Update = true;
+                        switch (Type)
+                        {
+                            case FieldType.address:
+                                if (value.GetType() != typeof (QAddress))
+                                    throw new ArgumentException(
+                                        $"Can't supply type of {value.GetType()} to a {this.Type} field.");
+                                Dictionary<string, int> colDict = ((IQColumn_int) Column).GetComposites();
+                                Record[colDict["street"]] = ((QAddress) value).Line1;
+                                Record[colDict["street2"]] = ((QAddress) value).Line2;
+                                Record[colDict["city"]] = ((QAddress) value).City;
+                                Record[colDict["region"]] = ((QAddress) value).Province;
+                                Record[colDict["postal"]] = ((QAddress) value).PostalCode;
+                                Record[colDict["country"]] = ((QAddress) value).Country;
+                                break;
+                            case FieldType.rating:
+                                if (value.GetType() != typeof(float) || (float) value < 0 || (float) value > 5)
+                                    throw new ArgumentException("Invalid value for 'rating' field.");
+                                _value = value;
+                                break;
+                            case FieldType.date:
+                                if (value.GetType() != typeof(DateTime))
+                                    throw new ArgumentException($"Can't supply type of {value.GetType()} to a {this.Type} field.");
+                                _value = ((DateTime) value).Date;
+                                break;
+                            case FieldType.timestamp:
+                                if (value.GetType() != typeof(DateTime))
+                                    throw new ArgumentException($"Can't supply type of {value.GetType()} to a {this.Type} field.");
+                                _value = value;
+                                break;
+                            case FieldType.duration:
+                            case FieldType.timeofday:
+                                if (value.GetType() != typeof(TimeSpan))
+                                    throw new ArgumentException($"Can't supply type of {value.GetType()} to a {this.Type} field.");
+                                _value = value;
+                                break;
+                            case FieldType.@float:
+                            case FieldType.currency:
+                            case FieldType.percent:
+                                decimal? val = value as decimal?;
+                                Int32? val2 = value as Int32?;
+                                if (val == null && val2 == null)
+                                    throw new ArgumentException($"Can't supply type of {value.GetType()} to a {this.Type} field.");
+                                _value = val ?? val2.Value;
+                                break;
+                            case FieldType.checkbox:
+                                if (value.GetType() != typeof(bool))
+                                    throw new ArgumentException($"Can't supply type of {value.GetType()} to a {this.Type} field.");
+                                _value = value;
+                                break;
+                            case FieldType.recordid:
+                                if (value.GetType() != typeof(int?))
+                                   throw new ArgumentException($"Can't supply type of {value.GetType()} to a {this.Type} field.");
+                                _value = value;
+                                break;
+                            case FieldType.multitext:
+                                if (value.GetType() != typeof(HashSet<int>))
+                                    throw new ArgumentException($"Can't supply type of {value.GetType()} to a {this.Type} field.");
+                                _value = value;
+                                break;
+                            default:
+                                if (value.GetType() != typeof(string))
+                                    throw new ArgumentException($"Can't supply type of {value.GetType()} to a {this.Type} field.");
+                                if (Type == FieldType.text)
+                                    UncleanText = CSVUncleanRegEx.IsMatch((string)value);
+                                _value = value;
+                                break;
+                        }
+                    }
                 }
-                _value = value;
             }
         }
         internal FieldType Type { get; set; }
         internal IQRecord Record { get; set; }
+        internal IQColumn Column { get; set; }
         internal string FullName { get; set; }
         internal bool Update { get; set; }
 
         public bool Equals(QField other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
             return other.FieldId == FieldId;
         }
 
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != typeof (QField)) return false;
             return Equals((QField) obj);
@@ -79,13 +269,99 @@ public override int GetHashCode()
 
         public override string ToString()
         {
-            return Value;
+            return Value.ToString();
         }
 
         private static DateTime ConvertQBMillisecondsToDateTime(string milliseconds)
         {
-            var date = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-            return new DateTime(date.Ticks + (Int64.Parse(milliseconds) * TimeSpan.TicksPerMillisecond));
+            DateTime dtu = new DateTime(long.Parse(milliseconds) * TimeSpan.TicksPerMillisecond + TSOffset.Ticks, DateTimeKind.Utc);
+            return dtu.ToLocalTime();
+        }
+
+        private static DateTime ConvertQBMillisecondsToDate(string milliseconds)
+        {
+            DateTime dtu = new DateTime(long.Parse(milliseconds) * TimeSpan.TicksPerMillisecond + TSOffset.Ticks, DateTimeKind.Utc);
+            //return dtu.ToLocalTime().Date;
+            return dtu.Date;
+        }
+        private static TimeSpan ConvertQBDurationToTimeSpan(string milliseconds)
+        {
+            return new TimeSpan(long.Parse(milliseconds) * TimeSpan.TicksPerMillisecond);
+        }
+
+        private static TimeSpan ConvertQBTimeOfDayToTime(string milliseconds)
+        {
+            return new TimeSpan(long.Parse(milliseconds) * TimeSpan.TicksPerMillisecond);
+        }
+
+        private static string ConvertDateTimeToQBMilliseconds(DateTime inDT)
+        {
+            DateTime dte = inDT.ToUniversalTime();
+            return ((dte.Ticks - TSOffset.Ticks) / TimeSpan.TicksPerMillisecond).ToString();
+        }
+
+        private static string ConvertDateToQBMilliseconds(DateTime inDT)
+        {
+            DateTime dte = inDT.Date;
+            return ((dte.Ticks - TSOffset.Ticks) / TimeSpan.TicksPerMillisecond).ToString();
+        }
+
+        private static string ConvertTimeSpanToQBTimeOfDay(TimeSpan inTime)
+        {
+            DateTime dt = new DateTime() + inTime;
+            return dt.ToString("h:mm tt");
+        }
+
+        private static string ConvertTimeSpanToQBDuration(TimeSpan inTime)
+        {
+            return ($"{inTime.TotalMilliseconds} milliseconds");
+        }
+
+        private HashSet<int> ConvertQBStringToHashSet(string value)
+        {
+            HashSet<int> retVal = new HashSet<int>();
+            string[] vals = value.Split(';');
+            List<object> optionList = Column.GetChoices();
+            if (optionList == null)
+                throw new InvalidChoiceException($"No options in field {Column.ColumnName}");
+            foreach (string val in vals)
+            {
+                bool found = false;
+                for (int i = 0; i < optionList.Count; i++)
+                {
+                    if (optionList[i].Equals(val))
+                    {
+                        retVal.Add(i);
+                        found = true;
+                        break;
+                    }
+                }
+
+                if (!found)
+                {
+                    if (Column.ColumnSummary || Column.ColumnLookup)
+                    {
+                        // QB doesn't send options for summary or lookup fields
+                        ((IQColumn_int)Column).AddChoice(val, true);
+                        retVal.Add(optionList.Count);
+                        optionList = Column.GetChoices();
+                    }
+                    else
+                        throw new InvalidChoiceException($"Specified multitext option '{val}' not found in field {Column.ColumnName} in record downloaded from QB?");
+                }
+            }
+            return retVal;
+        }
+
+        private string ConvertHashSetToQBMultiSelect(HashSet<int> value)
+        {
+            List<object> optList = Column.GetChoices();
+            List<string> strList = new List<string>();
+            foreach (int i in value)
+            {
+                strList.Add(optList[i].ToString());
+            }
+            return string.Join(";", strList);
         }
     }
 }
diff --git a/Intuit.QuickBase.Client/QRecord.cs b/Intuit.QuickBase.Client/QRecord.cs
index 9728995..2c3e756 100644
--- a/Intuit.QuickBase.Client/QRecord.cs
+++ b/Intuit.QuickBase.Client/QRecord.cs
@@ -8,18 +8,19 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Xml;
-using System.Xml.XPath;
+using System.Linq;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core;
 using Intuit.QuickBase.Core.Exceptions;
 
 namespace Intuit.QuickBase.Client
 {
-    public class QRecord : IQRecord
+    public class QRecord : IQRecord, IQRecord_int
     {
         // Instance fields
         private readonly List<QField> _fields;
         private RecordState _recordState = RecordState.New;
+        private bool _unclean;
 
         // Constructors
         internal QRecord(IQApplication application, IQTable table, QColumnCollection columns)
@@ -30,7 +31,7 @@ internal QRecord(IQApplication application, IQTable table, QColumnCollection col
             _fields = new List<QField>();
         }
 
-        internal QRecord(IQApplication application, IQTable table, QColumnCollection columns, XPathNavigator recordNode)
+        internal QRecord(IQApplication application, IQTable table, QColumnCollection columns, XElement recordNode)
             : this(application, table, columns)
         {
             FillRecord(recordNode);
@@ -44,6 +45,18 @@ internal QRecord(IQApplication application, IQTable table, QColumnCollection col
         public bool IsOnServer { get; private set; }
         public int RecordId { get; private set; }
 
+        public bool UncleanState
+        {
+            get
+            {
+                return _unclean;
+            }
+            internal set
+            {
+                _unclean = value;
+            }
+        }
+
         public RecordState RecordState
         {
             get
@@ -56,18 +69,42 @@ internal set
             }
         }
 
-        public string this[int index]
+        private void FieldLoad(int index, string value)
+        {
+            // Get field location with column index
+            int fieldIndex = _fields.IndexOf(new QField(Columns[index].ColumnId));
+
+            if (fieldIndex > -1)
+            {
+                SetExistingField(index, fieldIndex, value);
+            }
+            else
+            {
+                CreateNewField(index, value, true);
+            }            
+        }
+
+        public object this[int index]
         {
             get
             {
+                // Get field location with column index
+                int fieldIndex = _fields.IndexOf(new QField(Columns[index].ColumnId));
+
+                if (fieldIndex == -1)
+                {
+                    //make null field
+                    CreateNewField(index, null, false);
+                    fieldIndex = _fields.IndexOf(new QField(Columns[index].ColumnId));
+                }
                 // Return field with column index
-                return _fields[index].Value;
+                return _fields[fieldIndex].Value;
             }
 
             set
             {
                 // Get field location with column index
-                var fieldIndex = _fields.IndexOf(new QField(Columns[index].ColumnId));
+                int fieldIndex = _fields.IndexOf(new QField(Columns[index].ColumnId));
 
                 if(fieldIndex > -1)
                 {
@@ -75,28 +112,37 @@ public string this[int index]
                 }
                 else
                 {
-                    CreateNewField(index, value);
+                    CreateNewField(index, value, false);
                 }
             }
         }
 
-        public string this[string columnName]
+        public object this[string columnName]
         {
             get
             {
                 // Get column index
-                var index = GetColumnIndex(columnName);
+                int index = GetColumnIndex(columnName);
 
+                // Get field location with column index
+                int fieldIndex = _fields.IndexOf(new QField(Columns[index].ColumnId));
+
+                if (fieldIndex == -1)
+                {
+                    //make null field
+                    CreateNewField(index, null, false);
+                    fieldIndex = _fields.IndexOf(new QField(Columns[index].ColumnId));
+                }
                 // Return field with column index
-                return _fields[index].Value;
+                return _fields[fieldIndex].Value;
             }
             set
             {
                 // Get column index
-                var index = GetColumnIndex(columnName);
+                int index = GetColumnIndex(columnName);
 
                 // Get field location with column index
-                var fieldIndex = _fields.IndexOf(new QField(Columns[index].ColumnId));
+                int fieldIndex = _fields.IndexOf(new QField(Columns[index].ColumnId));
 
                 if (fieldIndex > -1)
                 {
@@ -104,108 +150,181 @@ public string this[string columnName]
                 }
                 else
                 {
-                    CreateNewField(index, value);
+                    CreateNewField(index, value, false);
                 }
             }
         }
 
         public void AcceptChanges()
         {
-            var fieldsToPost = new List<IField>();
-
-            if(RecordState == RecordState.Modified)
+            List<IField> fieldsToPost;
+            switch (RecordState)
             {
-                foreach (var field in _fields)
-                {
-                    if (field.Update)
+                case RecordState.Modified:
+                    fieldsToPost = new List<IField>();
+                    foreach (QField field in _fields)
+                    {
+                        if (field.Column.ColumnLookup || field.Column.ColumnSummary || field.Column.ColumnVirtual)
+                            continue; //don't try to update values that are results of lookups
+                        if (field.Update)
+                        {
+                            IField qField = new Field(field.FieldId, field.Type, field.QBValue);
+                            if (field.Type == FieldType.file)
+                            {
+                                qField.File = field.FullName;
+                            }
+
+                            fieldsToPost.Add(qField);
+                            field.Update = false;
+                        }
+                    }
+
+                    EditRecord.Builder editBuilder = new EditRecord.Builder(Application.Client.Ticket, Application.Token,
+                        Application.Client.AccountDomain, Table.TableId, RecordId, fieldsToPost);
+                    editBuilder.SetTimeInUtc(true);
+                    EditRecord editRecord = editBuilder.Build();
+                    editRecord.Post();
+                    RecordState = RecordState.Unchanged;
+                    break;
+
+                case RecordState.New:
+                    fieldsToPost = new List<IField>();
+                    foreach (QField field in _fields)
                     {
-                        IField qField = new Field(field.FieldId, field.Type, field.Value);
-                        if(field.Type == FieldType.file)
+                        if (field.Column.ColumnLookup || field.Column.ColumnSummary || field.Column.ColumnVirtual)
+                            continue; //don't try to update values that are results of lookups
+                        IField qField = new Field(field.FieldId, field.Type, field.QBValue);
+                        if (field.Type == FieldType.file)
                         {
                             qField.File = field.FullName;
                         }
+
                         fieldsToPost.Add(qField);
-                        field.Update = false;
                     }
-                }
-                var editRecord = new EditRecord.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, Table.TableId, RecordId, fieldsToPost).Build();
-                editRecord.Post();
-                RecordState = RecordState.Unchanged;
+
+                    AddRecord.Builder addBuilder = new AddRecord.Builder(Application.Client.Ticket, Application.Token,
+                        Application.Client.AccountDomain, Table.TableId, fieldsToPost);
+                    addBuilder.SetTimeInUtc(true);
+                    AddRecord addRecord = addBuilder.Build();
+                    RecordState = RecordState.Unchanged;
+
+                    XElement xml = addRecord.Post();
+                    RecordId = int.Parse(xml.Element("rid").Value);
+                    RecordState = RecordState.Unchanged;
+                    IsOnServer = true;
+                    break;
             }
-            else if(RecordState == RecordState.New)
+        }
+
+        public string GetAsCSV(string clist)
+        {
+            List<string> csvList = new List<string>();
+            List<int> cols = clist.Split('.').Select(Int32.Parse).ToList();
+            foreach (int col in cols)
             {
-                foreach (var field in _fields)
+                QField field = _fields.FirstOrDefault(fld => fld.FieldId == col);
+                if (field == null)
                 {
-                    IField qField = new Field(field.FieldId, field.Type, field.Value);
-                    if (field.Type == FieldType.file)
-                    {
-                        qField.File = field.FullName;
-                    }
-                    fieldsToPost.Add(qField);
+                    csvList.Add(String.Empty);
+                }
+                else
+                {                    
+                    if (field.Type == FieldType.file) throw new InvalidChoiceException(); //Can't upload a file via CSV upload
+                    csvList.Add(CSVQuoter(field.QBValue));
                 }
-                var addRecord = new AddRecord.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, Table.TableId, fieldsToPost).Build();
-                RecordState = RecordState.Unchanged;
-
-                var xml = addRecord.Post().CreateNavigator();
-                RecordId = int.Parse(xml.SelectSingleNode("/qdbapi/rid").Value);
-                RecordState = RecordState.Unchanged;
-                IsOnServer = true;
             }
+            return String.Join(",", csvList);
+        }
+
+        private static string CSVQuoter(string inStr)
+        {
+            //if the string contains quote character(s), newlines or commas, surround the string with quotes, and double quotes if present
+            if (inStr.Contains("\"") || inStr.Contains(",") || inStr.Contains("\n") || inStr.Contains("\r"))
+                return "\"" + inStr.Replace("\"","\"\"") + "\"";
+            else
+                return inStr;
+        }
+
+        public void ForceUpdateState(int recId)
+        {
+            RecordState = RecordState.Unchanged;
+            IsOnServer = true;
+            RecordId = recId;
+            //Todo: update 'Record ID#' field if it exists
         }
 
-        private void FillRecord(XPathNavigator recordNode)
+        public void ForceUpdateState()
+        {
+            RecordState = RecordState.Unchanged;
+            IsOnServer = true;
+        }
+
+        private void FillRecord(XElement recordNode)
         {
             IsOnServer = true;
-            var fieldNodes = recordNode.Select("f");
-            var colIndex = 0;
-            foreach (XPathNavigator fieldNode in fieldNodes)
+            int colIndex = 0;
+            foreach (XElement fieldNode in recordNode.Elements("f"))
             {
-                if (fieldNode.HasChildren && fieldNode.MoveToChild("url", String.Empty))
+                if (fieldNode.HasElements && fieldNode.Element("url") != null)
                 {
-                    fieldNode.MoveToFirst();
-                    this[colIndex] = fieldNode.TypedValue as string;
+                    XElement childNode = fieldNode.Descendants().First();
+                    FieldLoad(colIndex, childNode.Value);
                 }
                 else
                 {
-                    this[colIndex] = fieldNode.TypedValue as string;
+                    FieldLoad(colIndex, fieldNode.Value);
                 }
 
-                if (fieldNode.GetAttribute("id", String.Empty).Equals("3"))
+                if (fieldNode.Attribute("id").Value.Equals("3"))
                 {
-                    RecordId = fieldNode.ValueAsInt;
+                    RecordId = int.Parse(fieldNode.Value);
                 }
                 colIndex++;
             }
             RecordState = RecordState.Unchanged;
         }
 
+        public void UploadFile(string columnName, string filePath)
+        {
+            // create new field with columnName
+            int index = GetColumnIndex(columnName);
+            CreateNewField(index, columnName, false);
+            
+            // change type to file
+            Columns[index].ColumnType = FieldType.file;
+            
+            // Get field location with column index
+            int fieldIndex = _fields.IndexOf(new QField(Columns[index].ColumnId));
+            SetExistingField(index, fieldIndex, filePath);
+        }
+
         public void DownloadFile(string columnName, string path, int versionId)
         {
-            var index = GetColumnIndex(columnName);
-            var field = _fields[_fields.IndexOf(new QField(Columns[index].ColumnId))];
-            var fileName = field.Value;
+            int index = GetColumnIndex(columnName);
+            QField field = _fields[_fields.IndexOf(new QField(Columns[index].ColumnId))];
+            string fileName = (string)field.Value;
 
-            var fileToDownload = new DownloadFile(Application.Client.Ticket, Application.Client.AccountDomain, path, fileName, Table.TableId, RecordId,
+            DownloadFile fileToDownload = new DownloadFile(Application.Client.Ticket, Application.Client.AccountDomain, path, fileName, Table.TableId, RecordId,
                                                            field.FieldId, versionId);
             fileToDownload.Get();
         }
 
         public void ChangeOwnerTo(string newOwner)
         {
-            var changeRecordOwner = new ChangeRecordOwner(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, Table.TableId, RecordId, newOwner);
+            ChangeRecordOwner changeRecordOwner = new ChangeRecordOwner(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, Table.TableId, RecordId, newOwner);
             changeRecordOwner.Post();
         }
 
         public bool Equals(IQRecord record)
         {
-            if (ReferenceEquals(null, record)) return false;
+            if (record is null) return false;
             if (ReferenceEquals(this, record)) return true;
             return record.RecordId == RecordId;
         }
 
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != typeof (QRecord)) return false;
             return Equals((IQRecord) obj);
@@ -221,50 +340,58 @@ public override string ToString()
             return RecordId.ToString();
         }
 
-        private void CreateNewField(int index, string value)
+        //value 'QBInternal' is passed into the QField, and specifies if the column exists inside QB's internal dataformat, or is .Net datatype
+        private void CreateNewField(int index, object value, bool QBInternal)
         {
             if (Columns[index].ColumnType == FieldType.file && !IsOnServer)
             {
-                var field = new QField(Columns[index].ColumnId, Path.GetFileName(value), Columns[index].ColumnType, this)
+                string fileName = (string)value;
+                QField field = new QField(Columns[index].ColumnId, Path.GetFileName(fileName), Columns[index].ColumnType, this, Columns[index], QBInternal)
                 {
-                    FullName = value
+                    FullName = fileName
                 };
                 _fields.Add(field);
             }
             else
             {
-                var field = new QField(Columns[index].ColumnId, value, Columns[index].ColumnType, this);
+                QField field = new QField(Columns[index].ColumnId, value, Columns[index].ColumnType, this, Columns[index], QBInternal);
                 _fields.Add(field);
             }
+            UncleanState = _fields.Any(f => f.UncleanText);
         }
 
-        private void SetExistingField(int index, int fieldIndex, string value)
+        private void SetExistingField(int index, int fieldIndex, object value)
         {
             if (Columns[index].ColumnType == FieldType.file)
             {
-                _fields[fieldIndex].Value = Path.GetFileName(value);
-                _fields[fieldIndex].FullName = value;
+                string fileName = (string) value;
+                _fields[fieldIndex].Value = Path.GetFileName(fileName);
+                _fields[fieldIndex].FullName = fileName;
+                if (RecordState != RecordState.New)
+                {
+                    RecordState = RecordState.Modified;
+                }
             }
             else
             {
-                _fields[fieldIndex].Value = value;
-            }
-
-            if (RecordState != RecordState.New)
-            {
-                RecordState = RecordState.Modified;
+                if (_fields[fieldIndex].Value == null || !_fields[fieldIndex].Value.Equals(value))
+                {
+                    _fields[fieldIndex].Value = value;
+                    if (RecordState != RecordState.New)
+                    {
+                        RecordState = RecordState.Modified;
+                    }
+                }
             }
+            UncleanState = _fields.Any(f => f.UncleanText == true);
         }
 
-        private int GetColumnIndex(string columnName)
+        public int GetColumnIndex(string columnName)
         {
-            var index = Columns.IndexOf(new QColumn
-            {
-                ColumnName = columnName
-            });
+            int index = Columns.FindIndex(c => c.ColumnName == columnName);
             if (index == -1)
             {
-                throw new ColumnDoesNotExistInTableExecption("Column not found in table.");
+                throw new ColumnDoesNotExistInTableException($"Column '{columnName}' not found in table.");
             }
             return index;
         }
diff --git a/Intuit.QuickBase.Client/QRecordCollection.cs b/Intuit.QuickBase.Client/QRecordCollection.cs
index a6f45ae..c24e6b5 100644
--- a/Intuit.QuickBase.Client/QRecordCollection.cs
+++ b/Intuit.QuickBase.Client/QRecordCollection.cs
@@ -5,8 +5,14 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Collections.Generic;
+
 using Intuit.QuickBase.Core;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Client
 {
@@ -22,6 +28,7 @@ public QRecordCollection(IQApplication application, IQTable table)
         }
 
         private IQApplication Application { get; set; }
+
         private IQTable Table { get; set; }
 
         public new bool Remove(IQRecord record)
@@ -33,13 +40,124 @@ public QRecordCollection(IQApplication application, IQTable table)
             return base.Remove(record);
         }
 
+        public new void RemoveAt(int index)
+        {
+            IQRecord record = this[index];
+            if (record.IsOnServer)
+            {
+                _recordsToRemove.Add(record.RecordId);
+            }
+            base.RemoveAt(index);
+        }
+
+        public new void RemoveRange(int start, int count)
+        {
+            for (int idx = start; idx < start + count; idx++)
+            {
+                IQRecord record = this[idx];
+                if (record.IsOnServer)
+                {
+                    _recordsToRemove.Add(record.RecordId);
+                }
+            }
+            base.RemoveRange(start, count);
+        }
+
+        public new void RemoveAll(Predicate<IQRecord> predicate)
+        {
+            int idx;
+            int startIdx = 0;
+            while ((idx = this.FindIndex(startIdx, predicate)) >= 0)
+            {
+                IQRecord record = this[idx];
+                if (record.IsOnServer)
+                {
+                    _recordsToRemove.Add(record.RecordId);
+                }
+                startIdx = idx + 1;
+            }
+            base.RemoveAll(predicate);
+        }
+
         internal void RemoveRecords()
         {
-            foreach (var recordId in _recordsToRemove)
+            if (_recordsToRemove.Count > 0)
+            {
+                int keyfield = Table.Columns.Single(c => c.ColumnType == FieldType.recordid).ColumnId;
+                List<string> lstQry = new List<string>();
+                _recordsToRemove.Sort();
+                int lastVal = _recordsToRemove[0];
+                int rangeStart = -1, rangeEnd = -1;
+                for (int i = 1; i < _recordsToRemove.Count; i++)
+                {
+                    int val = _recordsToRemove[i];
+                    if (val == lastVal + 1)
+                    {
+                        if (rangeStart == -1) rangeStart = lastVal;
+                        rangeEnd = val;
+                    }
+                    else
+                    {
+                        if (rangeStart != -1)
+                        {
+                            lstQry.Add($"{{'{keyfield}'.GTE.'{rangeStart}'}} AND {{'{keyfield}'.LTE.'{rangeEnd}'}}");
+                            rangeStart = -1;
+                            rangeEnd = -1;
+                        }
+                        else
+                        {
+                            lstQry.Add($"{{'{keyfield}'.EQ.'{lastVal}'}}");   
+                        }
+                    }
+                    lastVal = val;
+                }
+
+                lstQry.Add(rangeStart != -1
+                    ? $"{{'{keyfield}'.GTE.'{rangeStart}'}} AND {{'{keyfield}'.LTE.'{rangeEnd}'}}"
+                    : $"{{'{keyfield}'.EQ.'{lastVal}'}}");
+                StringBuilder qry = null;
+                int cnt = 0;
+                foreach (string addStr in lstQry)
+                {
+                    if (addStr.Contains("AND")) cnt += 2;
+                    else cnt += 1;
+                    if (qry == null)
+                        qry = new StringBuilder(addStr);
+                    else
+                    {
+                        qry.Append(" OR " + addStr);
+                    }
+                    if (cnt >= 98)
+                    {
+                        SendDelete(qry.ToString());
+                        cnt = 0;
+                        qry = null;
+                    }
+                }
+                if (qry != null) SendDelete(qry.ToString());
+            }
+            _recordsToRemove.Clear();
+        }
+
+        private void SendDelete(string qry)
+        {
+            PurgeRecords.Builder prBuild = new PurgeRecords.Builder(Application.Client.Ticket, Application.Token,
+                Application.Client.AccountDomain, Table.TableId);
+            prBuild.SetQuery(qry);
+            XElement xml = prBuild.Build().Post();
+            if (xml != null)
+            {
+                int result = int.Parse(xml.Element("errcode").Value);
+                if (result != 0)
+                {
+                    string errMsg = xml.Element("errtxt")?.Value;
+                    throw new ApplicationException("Error in RemoveRecords: '" + errMsg + "'");
+                }
+            }
+            else
             {
-                var deleteRecord = new DeleteRecord(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, Table.TableId, recordId);
-                deleteRecord.Post();
+                throw new InvalidDataException("No XML returned from table query!");
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Intuit.QuickBase.Client/QRecordFactory.cs b/Intuit.QuickBase.Client/QRecordFactory.cs
index 4916cf3..ef8a55a 100644
--- a/Intuit.QuickBase.Client/QRecordFactory.cs
+++ b/Intuit.QuickBase.Client/QRecordFactory.cs
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Client
 {
@@ -29,7 +29,7 @@ internal override IQRecord CreateInstance(IQApplication application, IQTable tab
             return new QRecord(application, table, columns);
         }
 
-        internal override IQRecord CreateInstance(IQApplication application, IQTable table, QColumnCollection columns, XPathNavigator recordNode)
+        internal override IQRecord CreateInstance(IQApplication application, IQTable table, QColumnCollection columns, XElement recordNode)
         {
             return new QRecord(application, table, columns, recordNode);
         }
diff --git a/Intuit.QuickBase.Client/QRecordFactoryBase.cs b/Intuit.QuickBase.Client/QRecordFactoryBase.cs
index ab72cfe..058ee5a 100644
--- a/Intuit.QuickBase.Client/QRecordFactoryBase.cs
+++ b/Intuit.QuickBase.Client/QRecordFactoryBase.cs
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Client
 {
@@ -13,6 +13,6 @@ internal abstract class QRecordFactoryBase
     {
         internal abstract IQRecord CreateInstance(IQApplication application, IQTable table, QColumnCollection columns);
 
-        internal abstract IQRecord CreateInstance(IQApplication application, IQTable table, QColumnCollection columns, XPathNavigator recordNode);
+        internal abstract IQRecord CreateInstance(IQApplication application, IQTable table, QColumnCollection columns, XElement recordNode);
     }
 }
diff --git a/Intuit.QuickBase.Client/QTable.cs b/Intuit.QuickBase.Client/QTable.cs
index 999f2cc..eb41b83 100644
--- a/Intuit.QuickBase.Client/QTable.cs
+++ b/Intuit.QuickBase.Client/QTable.cs
@@ -5,34 +5,52 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
+
 using System;
 using System.Collections.Generic;
-using System.Xml.XPath;
+using System.Linq;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core;
+using Intuit.QuickBase.Core.Exceptions;
+using System.Text.RegularExpressions;
 
 namespace Intuit.QuickBase.Client
 {
     public class QTable : IQTable
     {
+        internal bool IsLoaded { get; private set; }
+
         // Constructors
         internal QTable(QColumnFactoryBase columnFactory, QRecordFactoryBase recordFactory, IQApplication application, string tableId)
         {
-            CommonConstruction(columnFactory, recordFactory, application, tableId);
-            Load();
+            if (columnFactory == null)
+            {
+                columnFactory = QColumnFactory.GetInstance();
+                recordFactory = QRecordFactory.GetInstance();
+                CommonConstruction(columnFactory, recordFactory, application, tableId);
+                IsLoaded = false;
+            }
+            else
+            {
+                CommonConstruction(columnFactory, recordFactory, application, tableId);
+                Load();
+            }
         }
 
         internal QTable(QColumnFactoryBase columnFactory, QRecordFactoryBase recordFactory, IQApplication application, string tableName, string pNoun)
         {
-            var createTable = new CreateTable.Builder(application.Client.Ticket, application.Token, application.Client.AccountDomain, application.ApplicationId)
+            CreateTable createTable = new CreateTable.Builder(application.Client.Ticket, application.Token, application.Client.AccountDomain, application.ApplicationId)
                 .SetTName(tableName)
                 .SetPNoun(pNoun)
                 .Build();
-            var xml = createTable.Post().CreateNavigator();
-            var tableId = xml.SelectSingleNode("/qdbapi/newdbid").Value;
+            XElement xml = createTable.Post();
+            string tableId = xml.Element("newdbid").Value;
 
             TableName = tableName;
             RecordNames = pNoun;
             CommonConstruction(columnFactory, recordFactory, application, tableId);
+            RefreshColumns(); //grab basic columns that QB automatically makes
+            IsLoaded = true;
         }
 
         private void CommonConstruction(QColumnFactoryBase columnFactory, QRecordFactoryBase recordFactory, IQApplication application, string tableId)
@@ -43,19 +61,34 @@ private void CommonConstruction(QColumnFactoryBase columnFactory, QRecordFactory
             TableId = tableId;
             Records = new QRecordCollection(Application, this);
             Columns = new QColumnCollection(Application, this);
+            KeyFID = -1;
+            KeyCIdx = -1;
         }
 
         // Properties
         private IQApplication Application { get; set; }
+
         public string TableId { get; private set; }
+
         public string TableName { get; private set; }
+
         public string RecordNames { get; private set; }
+
         public QRecordCollection Records { get; private set; }
+
         public QColumnCollection Columns { get; private set; }
 
         private QColumnFactoryBase ColumnFactory { get; set; }
+
         private QRecordFactoryBase RecordFactory { get; set; }
 
+        public int KeyFID { get; private set; }
+
+        public int KeyCIdx { get; private set; }
+
+        private static readonly string[] QuerySeparator = {"}OR{"};
+        private static readonly Regex QueryCheckRegex = new Regex(@"[\)}]AND[\({]");
+
         // Methods
         public void Clear()
         {
@@ -63,35 +96,86 @@ public void Clear()
             Columns.Clear();
         }
 
+        public string GenCsv()
+        {
+            GenResultsTable genResultsTable = new GenResultsTable.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                .SetOptions("csv")
+                .Build();
+            XElement xml = genResultsTable.Post();
+            return xml.Value;
+        }
+
         public string GenCsv(int queryId)
         {
-            var genResultsTable = new GenResultsTable.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+            GenResultsTable genResultsTable = new GenResultsTable.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
                 .SetQid(queryId)
                 .SetOptions("csv")
                 .Build();
-            var xml = genResultsTable.Post().CreateNavigator();
-            return xml.SelectSingleNode("/response_data").Value;
+            XElement xml = genResultsTable.Post();
+            return xml.Value;
+        }
+
+        public string GenCsv(Query query)
+        {
+            GenResultsTable genResultsTable = new GenResultsTable.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                .SetQuery(query.ToString())
+                .SetOptions("csv")
+                .Build();
+            XElement xml = genResultsTable.Post();
+            return xml.Value;
+        }
+
+        public string GenHtml(string options = "", string colList = "a")
+        {
+            GenResultsTable genResultsTable = new GenResultsTable.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                .SetOptions(options)
+                .SetCList(colList)
+                .Build();
+            XElement xml = genResultsTable.Post();
+            return xml.Value;
+        }
+
+        public string GenHtml(int queryId, string options = "", string colList = "a")
+        {
+            GenResultsTable genResultsTable = new GenResultsTable.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                .SetQid(queryId)
+                .SetOptions(options)
+                .SetCList(colList)
+                .Build();
+            XElement xml = genResultsTable.Post();
+            return xml.Value;
+        }
+
+        public string GenHtml(Query query, string options = "", string colList = "a")
+        {
+            GenResultsTable genResultsTable = new GenResultsTable.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                .SetQuery(query.ToString())
+                .SetOptions(options)
+                .SetCList(colList)
+                .Build();
+            XElement xml = genResultsTable.Post();
+            return xml.Value;
         }
 
-        public XPathDocument GetTableSchema()
+        public XElement GetTableSchema()
         {
-            var tblSchema = new GetSchema(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId);
+            GetSchema tblSchema = new GetSchema(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId);
             return tblSchema.Post();
         }
 
         public TableInfo GetTableInfo()
         {
-            var getTblInfo = new GetDbInfo(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId);
-            var xml = getTblInfo.Post().CreateNavigator();
-
-            var dbName = xml.SelectSingleNode("/qdbapi/dbname").Value;
-            var lastRecModTime = long.Parse(xml.SelectSingleNode("/qdbapi/lastRecModTime").Value);
-            var lastModifiedTime = long.Parse(xml.SelectSingleNode("/qdbapi/lastModifiedTime").Value);
-            var createTime = long.Parse(xml.SelectSingleNode("/qdbapi/createdTime").Value);
-            var numRecords = int.Parse(xml.SelectSingleNode("/qdbapi/numRecords").Value);
-            var mgrId = xml.SelectSingleNode("/qdbapi/mgrID").Value;
-            var mgrName = xml.SelectSingleNode("/qdbapi/mgrName").Value;
-            var version = xml.SelectSingleNode("/qdbapi/version").Value;
+            GetDbInfo getTblInfo = new GetDbInfo(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId);
+            XElement xml = getTblInfo.Post();
+
+            string dbName = xml.Element("dbname").Value;
+            long lastRecModTime = long.Parse(xml.Element("lastRecModTime").Value);
+            long lastModifiedTime = long.Parse(xml.Element("lastModifiedTime").Value);
+            long createTime = long.Parse(xml.Element("createdTime").Value);
+            int numRecords = int.Parse(xml.Element("numRecords").Value);
+            string mgrId = xml.Element("mgrID").Value;
+            string mgrName = xml.Element("mgrName").Value;
+            string version = xml.Element("version").Value;
 
             return new TableInfo(dbName, lastRecModTime, lastModifiedTime, createTime, numRecords, mgrId, mgrName,
                                     version);
@@ -99,168 +183,359 @@ public TableInfo GetTableInfo()
 
         public int GetServerRecordCount()
         {
-            var tblRecordCount = new GetNumRecords(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId);
-            var xml = tblRecordCount.Post().CreateNavigator();
-            return int.Parse(xml.SelectSingleNode("/qdbapi/num_records").Value);
+            GetNumRecords tblRecordCount = new GetNumRecords(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId);
+            XElement xml = tblRecordCount.Post();
+            return int.Parse(xml.Element("num_records").Value);
+        }
+
+        private void DoQuery(DoQuery qry, bool clear)
+        {
+            if (clear) Records.Clear();
+            try
+            {
+                XElement xml = qry.Post();
+                LoadColumns(xml); //In case the schema changes due to another user, or from a previous query that has a differing subset of columns TODO: remove this requirement
+                LoadRecords(xml);
+            }
+            catch (TooManyCriteriaInQueryException)
+            {
+                //If and only if all elements of a query are OR operations, we can split the query in 99 element chunks
+                string query = qry.Query;
+                if (string.IsNullOrEmpty(query) || QueryCheckRegex.IsMatch(query))
+                    throw;
+                string[] args = query.Split(QuerySeparator, StringSplitOptions.None);
+                int argCnt = args.Length;
+                if (argCnt < 100) //We've no idea how to split this, apparently...
+                    throw;
+                if (args[0].StartsWith("{")) args[0] = args[0].Substring(1); //remove leading {
+                if (args[argCnt - 1].EndsWith("}")) args[argCnt - 1] = args[argCnt - 1].Substring(0, args[argCnt - 1].Length - 1); // remove trailing }
+                if (args[argCnt - 1].EndsWith("}OR")) args[argCnt - 1] = args[argCnt - 1].Substring(0, args[argCnt - 1].Length - 3); // remove trailing }OR
+                int sentArgs = 0;
+                while (sentArgs < argCnt)
+                {
+                    int useArgs = Math.Min(99, argCnt - sentArgs);
+                    string[] argsToSend = args.Skip(sentArgs).Take(useArgs).ToArray();
+                    string sendQuery = "{" + string.Join("}OR{", argsToSend) + "}";
+                    DoQuery.Builder qBuild = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId).SetQuery(sendQuery).SetFmt(true);
+                    if (!string.IsNullOrEmpty(qry.Collist)) qBuild = qBuild.SetCList(qry.Collist);
+                    if (!string.IsNullOrEmpty(qry.Options)) qBuild = qBuild.SetOptions(qry.Options);
+                    DoQuery dqry = qBuild.Build();
+                    XElement xml = dqry.Post();
+                    if (sentArgs == 0) LoadColumns(xml);
+                    LoadRecords(xml);
+                    sentArgs += useArgs;
+                }
+            }
+            catch (Exception ex) when (ex is ViewTooLargeException || ex is OperationTookTooLongException)
+            {
+                //split into smaller queries auto-magically
+                List<string> optionsList = new List<string>();
+                string query = qry.Query;
+                string collist = qry.Collist;
+                int maxCount = 0;
+                int baseSkip = 0;
+                if (!string.IsNullOrEmpty(qry.Options))
+                {
+                    string[] optArry = qry.Options.Split('.');
+                    foreach (string opt in optArry)
+                    {
+                        if (opt.StartsWith("num-"))
+                        {
+                            maxCount = int.Parse(opt.Substring(4));
+                        }
+                        else if (opt.StartsWith("skp-"))
+                        {
+                            baseSkip = int.Parse(opt.Substring(4));
+                        }
+                        else
+                        {
+                            optionsList.Add(opt);
+                        }
+                    }
+                }
+                if (maxCount == 0)
+                {
+                    DoQueryCount dqryCnt;
+                    if (string.IsNullOrEmpty(query))
+                        dqryCnt = new DoQueryCount.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId).Build();
+                    else
+                        dqryCnt = new DoQueryCount.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId).SetQuery(query).Build();
+                    XElement cntXml = dqryCnt.Post();
+                    maxCount = int.Parse(cntXml.Element("numMatches").Value);
+                }
+                int stride = maxCount / 2;
+                int fetched = 0;
+                while (fetched < maxCount)
+                {
+                    List<string> optLst = new List<string>();
+                    optLst.AddRange(optionsList);
+                    optLst.Add("skp-" + (fetched + baseSkip));
+                    optLst.Add("num-" + stride);
+                    string options = string.Join(".", optLst);
+                    DoQuery dqry;
+                    if (string.IsNullOrEmpty(query))
+                        dqry = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                            .SetCList(collist)
+                            .SetOptions(options)
+                            .SetFmt(true)
+                            .Build();
+                    else
+                        dqry = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                            .SetQuery(query)
+                            .SetCList(collist)
+                            .SetOptions(options)
+                            .SetFmt(true)
+                            .Build();
+                    try
+                    {
+                        XElement xml = dqry.Post();
+                        if (fetched == 0) LoadColumns(xml);
+                        LoadRecords(xml);
+                        fetched += stride;
+                    }
+                    catch (ViewTooLargeException)
+                    {
+                        stride /= 2;
+                    }
+                    catch (ApiRequestLimitExceededException extime)
+                    {
+                        TimeSpan waitTime = extime.WaitUntil - DateTime.Now;
+                        System.Threading.Thread.Sleep(waitTime);
+                    }
+                }
+            }
         }
 
-        public void Query()
+        public void Query(bool clear = true)
         {
-            var doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+            DoQuery doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
                 .SetCList("a")
                 .SetFmt(true)
                 .Build();
-            var xml = doQuery.Post().CreateNavigator();
+            this.DoQuery(doQuery, clear);
+        }
 
-            LoadColumns(xml);
-            LoadRecords(xml);
+        public void Query(string options, bool clear = true)
+        {
+            DoQuery doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                .SetCList("a")
+                .SetFmt(true)
+                .SetOptions(options)
+                .Build();
+            this.DoQuery(doQuery, clear);
         }
 
-        public void Query(int[] clist)
+        public void Query(int[] colList, bool clear = true)
         {
-            var colList = GetColumnList(clist);
+            string clmnList = GetColumnList(colList);
 
-            var doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
-                .SetCList(colList)
+            DoQuery doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                .SetCList(clmnList)
                 .SetFmt(true)
                 .Build();
-            var xml = doQuery.Post().CreateNavigator();
-
-            LoadColumns(xml);
-            LoadRecords(xml);
+            this.DoQuery(doQuery, clear);
         }
 
-        public void Query(int[] clist, string options)
+        public void Query(int[] colList, string options, bool clear = true)
         {
-            var colList = GetColumnList(clist);
+            string clmnList = GetColumnList(colList);
 
-            var doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
-                .SetCList(colList)
+            DoQuery doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                .SetCList(clmnList)
                 .SetOptions(options)
                 .SetFmt(true)
                 .Build();
-            var xml = doQuery.Post().CreateNavigator();
-
-            LoadColumns(xml);
-            LoadRecords(xml);
+            this.DoQuery(doQuery, clear);
         }
 
-        public void Query(Query query)
+        public void Query(Query query, bool clear = true)
         {
-            var doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+            DoQuery doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
                 .SetQuery(query.ToString())
                 .SetCList("a")
                 .SetFmt(true)
                 .Build();
-            var xml = doQuery.Post().CreateNavigator();
+            this.DoQuery(doQuery, clear);
+        }
 
-            LoadColumns(xml);
-            LoadRecords(xml);
+        public void Query(Query query, string options, bool clear = true)
+        {
+            DoQuery doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                .SetQuery(query.ToString())
+                .SetCList("a")
+                .SetOptions(options)
+                .SetFmt(true)
+                .Build();
+            this.DoQuery(doQuery, clear);
         }
 
-        public void Query(Query query, int[] clist)
+        public void Query(Query query, int[] colList, bool clear = true)
         {
-            var colList = GetColumnList(clist);
+            string clmnList = GetColumnList(colList);
 
-            var doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+            DoQuery doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
                 .SetQuery(query.ToString())
-                .SetCList(colList)
+                .SetCList(clmnList)
                 .SetFmt(true)
                 .Build();
-            var xml = doQuery.Post().CreateNavigator();
-
-            LoadColumns(xml);
-            LoadRecords(xml);
+            this.DoQuery(doQuery, clear);
         }
 
-        public void Query(Query query, int[] clist, int[] slist)
+        public void Query(Query query, int[] colList, int[] sortList, bool clear = true)
         {
-            var solList = GetSortList(slist);
-            var colList = GetColumnList(clist);
+            string solList = GetSortList(sortList);
+            string clmnList = GetColumnList(colList);
 
-            var doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+            DoQuery doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
                 .SetQuery(query.ToString())
-                .SetCList(colList)
+                .SetCList(clmnList)
                 .SetSList(solList)
                 .SetFmt(true)
                 .Build();
-            var xml = doQuery.Post().CreateNavigator();
-
-            LoadColumns(xml);
-            LoadRecords(xml);
+            this.DoQuery(doQuery, clear);
         }
 
-        public void Query(Query query, int[] clist, int[] slist, string options)
+        public void Query(Query query, int[] colList, int[] sortList, string options, bool clear = true)
         {
-            var solList = GetSortList(slist);
-            var colList = GetColumnList(clist);
+            string solList = GetSortList(sortList);
+            string clmnList = GetColumnList(colList);
 
-            var doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+            DoQuery doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
                 .SetQuery(query.ToString())
-                .SetCList(colList)
+                .SetCList(clmnList)
                 .SetSList(solList)
                 .SetOptions(options)
                 .SetFmt(true)
                 .Build();
-            var xml = doQuery.Post().CreateNavigator();
-
-            LoadColumns(xml);
-            LoadRecords(xml);
+            this.DoQuery(doQuery, clear);
         }
 
-        public void Query(int queryId)
+        public void Query(int queryId, bool clear = true)
         {
-            var doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+            DoQuery doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
                 .SetQid(queryId)
                 .SetFmt(true)
                 .Build();
-            var xml = doQuery.Post().CreateNavigator();
+            this.DoQuery(doQuery, clear);
+        }
 
-            LoadColumns(xml);
-            LoadRecords(xml);
+        public void Query(int queryId, string options, bool clear = true)
+        {
+            DoQuery doQuery = new DoQuery.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                .SetQid(queryId)
+                .SetFmt(true)
+                .SetOptions(options)
+                .Build();
+            this.DoQuery(doQuery, clear);
         }
 
         public int QueryCount(Query query)
         {
-            var doQuery = new DoQueryCount.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+            DoQueryCount doQuery = new DoQueryCount.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
                 .SetQuery(query.ToString())
                 .Build();
-            var xml = doQuery.Post().CreateNavigator();
-            return int.Parse(xml.SelectSingleNode("/qdbapi/numMatches").Value);
+            XElement xml = doQuery.Post();
+            return int.Parse(xml.Element("numMatches").Value);
         }
 
         public int QueryCount(int queryId)
         {
-            var doQuery = new DoQueryCount.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+            DoQueryCount doQuery = new DoQueryCount.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
                 .SetQid(queryId)
                 .Build();
-            var xml = doQuery.Post().CreateNavigator();
-            return int.Parse(xml.SelectSingleNode("/qdbapi/numMatches").Value);
+            XElement xml = doQuery.Post();
+            return int.Parse(xml.Element("numMatches").Value);
         }
 
         public void PurgeRecords()
         {
-            var purge = new PurgeRecords.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId).Build();
+            PurgeRecords purge = new PurgeRecords.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId).Build();
             purge.Post();
             Records.Clear();
         }
 
         public void PurgeRecords(int queryId)
         {
-            var purge = new PurgeRecords.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+            PurgeRecords purge = new PurgeRecords.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
                 .SetQid(queryId)
                 .Build();
             purge.Post();
             Records.Clear();
         }
 
+        public void PurgeRecords(Query query)
+        {
+            PurgeRecords purge = new PurgeRecords.Builder(Application.Client.Ticket, Application.Token, Application.Client.AccountDomain, TableId)
+                .SetQuery(query.ToString())
+                .Build();
+            purge.Post();
+            Records.Clear();
+        }
+
         public void AcceptChanges()
         {
             Records.RemoveRecords();
-            foreach (var record in Records)
+            foreach (IQColumn_int col in Columns)
+            {
+                col.AcceptChanges(Application, TableId);
+            }
+            //optimize record uploads
+            List<IQRecord> addRecs = Records.Where(record => record.RecordState == RecordState.New && record.UncleanState == false).ToList();
+            List<IQRecord> modRecs = Records.Where(record => record.RecordState == RecordState.Modified && record.UncleanState == false).ToList();
+            List<IQRecord> uncleanRecs = Records.Where(record => record.UncleanState).ToList();
+            int acnt = addRecs.Count;
+            int mcnt = modRecs.Count;
+            bool hasFileColumn = Columns.Any(c => c.ColumnType == FieldType.file);
+            if (!hasFileColumn && ((acnt + mcnt) > 0))  // if no file-type columns involved, use csv upload method for reducing API calls and speeding processing.
+            {
+                List<String> csvLines = new List<string>(acnt + mcnt);
+                String colList = String.Join(".", KeyFID == -1 ? Columns.Where(col => (col.ColumnVirtual == false && col.ColumnLookup == false && col.ColumnSummary == false && string.IsNullOrEmpty(col.ColumnRole)) || col.ColumnType == FieldType.recordid).Select(col => col.ColumnId.ToString())
+                                                             : Columns.Where(col => (col.ColumnVirtual == false && col.ColumnLookup == false && col.ColumnSummary == false && string.IsNullOrEmpty(col.ColumnRole)) || col.ColumnId == KeyFID).Select(col => col.ColumnId.ToString()));
+                if (acnt > 0)
+                {
+                    csvLines.AddRange(addRecs.Select(record => record.GetAsCSV(colList)));
+                }
+                if (mcnt > 0)
+                {
+                    csvLines.AddRange(modRecs.Select(record => record.GetAsCSV(colList)));
+                }
+                ImportFromCSV.Builder csvBuilder = new ImportFromCSV.Builder(Application.Client.Ticket, Application.Token,
+                    Application.Client.AccountDomain, TableId, String.Join("\r\n", csvLines.ToArray()));
+                csvBuilder.SetCList(colList);
+                csvBuilder.SetTimeInUtc(true);
+                ImportFromCSV csvUpload = csvBuilder.Build();
+
+                XElement xml = csvUpload.Post();
+
+                if (acnt > 0) // set in-memory recordId with server value for all newly added values
+                {
+                    XElement xRids = xml.Element("rids");
+                    using (IEnumerator<XElement> xNodes = xRids.Elements("rid").GetEnumerator())
+                    {
+                        //set records as in server now
+                        foreach (IQRecord rec in addRecs)
+                        {
+                            xNodes.MoveNext();
+                            ((IQRecord_int) rec).ForceUpdateState(
+                                Int32.Parse(xNodes.Current.Value));
+                        }
+
+                        foreach (IQRecord rec in modRecs)
+                        {
+                            ((IQRecord_int) rec).ForceUpdateState();
+                        }
+                    }
+                }
+            }
+            else
             {
-                record.AcceptChanges();
+                foreach (IQRecord rec in addRecs)
+                    rec.AcceptChanges();
+                foreach (IQRecord rec in modRecs)
+                    rec.AcceptChanges();
             }
+            foreach (IQRecord rec in uncleanRecs)
+                rec.AcceptChanges();
         }
 
         public IQRecord NewRecord()
@@ -276,75 +551,106 @@ public override string ToString()
         internal void Load()
         {
             TableName = GetTableInfo().DbName;
-            LoadColumns();
+            RefreshColumns();
+            IsLoaded = true;
         }
 
-        private void LoadRecords(XPathNavigator xml)
+        private void LoadRecords(XElement xml)
         {
-            Records.Clear();
-            var recordNodes = xml.Select("/qdbapi/table/records/record");
-            foreach (XPathNavigator recordNode in recordNodes)
+            foreach (XElement recordNode in xml.Element("table").Element("records").Elements("record"))
             {
-                var record = RecordFactory.CreateInstance(Application, this, Columns, recordNode);
+                IQRecord record = RecordFactory.CreateInstance(Application, this, Columns, recordNode);
                 Records.Add(record);
             }
         }
 
-        private void LoadColumns()
+        public void RefreshColumns()
         {
-            LoadColumns(GetTableSchema().CreateNavigator());
+            LoadColumns(GetTableSchema());
         }
 
-        private void LoadColumns(XPathNavigator xml)
+        private void LoadColumns(XElement xml)
         {
             Columns.Clear();
-            var columnNodes = xml.Select("/qdbapi/table/fields/field");
-            foreach (XPathNavigator columnNode in columnNodes)
+            IEnumerable<XElement> columnNodes = xml.Element("table").Element("fields").Elements("field");
+            foreach (XElement columnNode in columnNodes)
             {
-                var columnId = int.Parse(columnNode.GetAttribute("id", String.Empty));
-                var type =
-                    (FieldType)Enum.Parse(typeof(FieldType), columnNode.GetAttribute("field_type", String.Empty), true);
-                var label = columnNode.SelectSingleNode("label").Value;
+                int columnId = int.Parse(columnNode.Attribute("id").Value);
+                FieldType type =
+                    (FieldType) Enum.Parse(typeof(FieldType), columnNode.Attribute("field_type").Value, true);
+                string label = columnNode.Element("label").Value;
+                bool hidden = columnNode.Element("appears_by_default")?.Value == "0";
+                bool canAddChoices = columnNode.Element("allow_new_choices")?.Value == "1";
+                string role = null;
+                if (columnNode.Attribute("role") != null)
+                {
+                    role = columnNode.Attribute("role").Value;
+                }
+                bool virt = false, lookup = false, summary = false;
+                if (columnNode.Attribute("mode") != null)
+                {
+                    string mode = columnNode.Attribute("mode").Value;
+                    virt = mode == "virtual";
+                    lookup = mode == "lookup";
+                    summary = mode == "summary";
+                }
 
-                var col = ColumnFactory.CreateInstace(columnId, label, type);
+                bool allowHTML = columnNode.Element("allowHTML")?.Value == "1";
+                IQColumn col = ColumnFactory.CreateInstance(columnId, label, type, role, virt, lookup, summary, hidden, allowHTML, canAddChoices);
+                if (columnNode.Element("choices") != null)
+                {
+                    foreach (XElement choicenode in columnNode.Element("choices").Elements("choice"))
+                    {
+                        object value;
+                        switch (type)
+                        {
+                            case FieldType.rating:
+                                value = Int32.Parse(choicenode.Value);
+                                break;
+                            default:
+                                value = choicenode.Value;
+                                break;
+                        }
+                        ((IQColumn_int) col).AddChoice(value, true);
+                    }
+                }
+                Dictionary<string, int> colComposites = ((IQColumn_int)col).GetComposites();
+                if (columnNode.Element("compositeFields") != null)
+                {
+                    foreach (XElement compositenode in columnNode.Element("compositeFields").Elements("compositeField"))
+                    {
+                        colComposites.Add(compositenode.Attribute("key").Value,
+                            Int32.Parse(compositenode.Attribute("id").Value));
+                    }
+                }
                 Columns.Add(col);
             }
+            XElement keyFidNode = xml.Element("table").Element("original").Element("key_fid");
+            KeyFID = keyFidNode != null ? Int32.Parse(keyFidNode.Value) : Columns.Find(c => c.ColumnType == FieldType.recordid).ColumnId;
+            KeyCIdx = Columns.FindIndex(c => c.ColumnId == KeyFID);
         }
 
-        private static string GetColumnList(ICollection<int> clist)
+        private static string GetColumnList(ICollection<int> colList)
         {
-            if (clist.Count > 0)
+            if (colList.Count > 0)
             {
                 const int RECORDID_COLUMN_ID = 3;
-                var columns = String.Empty;
-                var columnList = new List<int>(clist.Count + 1) { RECORDID_COLUMN_ID };
+                string columns = String.Empty;
+                List<int> columnList = new List<int>(colList.Count + 1) { RECORDID_COLUMN_ID };
+                columnList.AddRange(colList.Where(columnId => columnId != RECORDID_COLUMN_ID));
 
                 // Seed the list with the column ID of Record#ID
-                foreach (var columnId in clist)
-                {
-                    if (columnId != RECORDID_COLUMN_ID)
-                    {
-                        columnList.Add(columnId);
-                    }
-                }
 
-                foreach (var columnId in columnList)
-                {
-                    columns += columnId + ".";
-                }
+                columns = columnList.Aggregate(columns, (current, columnId) => current + (columnId + "."));
                 return columns.TrimEnd('.');
             }
             return "a";
         }
 
-        private static string GetSortList(IEnumerable<int> slist)
+        private static string GetSortList(IEnumerable<int> sortList)
         {
-            var solList = String.Empty;
-            foreach (var sol in slist)
-            {
-                solList += sol + ".";
-            }
+            string solList = sortList.Aggregate(String.Empty, (current, sol) => current + (sol + "."));
             return solList.TrimEnd('.');
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Intuit.QuickBase.Client/QTableFactory.cs b/Intuit.QuickBase.Client/QTableFactory.cs
index fd575d2..a551546 100644
--- a/Intuit.QuickBase.Client/QTableFactory.cs
+++ b/Intuit.QuickBase.Client/QTableFactory.cs
@@ -25,17 +25,23 @@ internal static QTableFactoryBase GetInstance()
         // Creates a new table in QuickBase
         internal override IQTable CreateInstance(IQApplication application, string tableName, string pNoun)
         {
-            var columnFactory = QColumnFactory.GetInstance();
-            var recordFactory = QRecordFactory.GetInstance();
+            QColumnFactoryBase columnFactory = QColumnFactory.GetInstance();
+            QRecordFactoryBase recordFactory = QRecordFactory.GetInstance();
             return new QTable(columnFactory, recordFactory, application, tableName, pNoun);
         }
         
         // Doesn't create a table in QuickBase
         internal override IQTable CreateInstance(IQApplication application, string tableId)
         {
-            var columnFactory = QColumnFactory.GetInstance();
-            var recordFactory = QRecordFactory.GetInstance();
+            QColumnFactoryBase columnFactory = QColumnFactory.GetInstance();
+            QRecordFactoryBase recordFactory = QRecordFactory.GetInstance();
             return new QTable(columnFactory, recordFactory, application, tableId);
         }
+
+        internal override IQTable CreateInstanceLazy(IQApplication application, string tableId)
+        {
+            return new QTable(null, null, application, tableId);
+        }
+
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Client/QTableFactoryBase.cs b/Intuit.QuickBase.Client/QTableFactoryBase.cs
index 830776f..4536333 100644
--- a/Intuit.QuickBase.Client/QTableFactoryBase.cs
+++ b/Intuit.QuickBase.Client/QTableFactoryBase.cs
@@ -12,5 +12,7 @@ internal abstract class QTableFactoryBase
         internal abstract IQTable CreateInstance(IQApplication application, string tableName, string pNoun);
 
         internal abstract IQTable CreateInstance(IQApplication application, string tableId);
+
+        internal abstract IQTable CreateInstanceLazy(IQApplication application, string tableId);
     }
 }
diff --git a/Intuit.QuickBase.Client/Query.cs b/Intuit.QuickBase.Client/Query.cs
index 98472c5..23e1917 100644
--- a/Intuit.QuickBase.Client/Query.cs
+++ b/Intuit.QuickBase.Client/Query.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Intuit.QuickBase.Client
 {
@@ -20,12 +21,7 @@ public void Add(QueryStrings query)
 
         public override string ToString()
         {
-            var querys = string.Empty;
-            foreach (var query in _queryStrings)
-            {
-                querys += query.ToString();
-            }
-            return querys;
+            return _queryStrings.Aggregate(string.Empty, (current, query) => current + query.ToString());
         }
     }
 }
diff --git a/Intuit.QuickBase.Client/QueryStrings.cs b/Intuit.QuickBase.Client/QueryStrings.cs
index d9e04d7..2039ba0 100644
--- a/Intuit.QuickBase.Client/QueryStrings.cs
+++ b/Intuit.QuickBase.Client/QueryStrings.cs
@@ -27,7 +27,7 @@ public QueryStrings(int fieldId, ComparisonOperator comparisonOp, string matchin
         // Methods
         public override string ToString()
         {
-            var logicalOp = string.Empty;
+            string logicalOp = string.Empty;
 
             switch (LogicalOp)
             {
diff --git a/Intuit.QuickBase.Client/QuickBase.cs b/Intuit.QuickBase.Client/QuickBase.cs
index c249c5a..9bce804 100644
--- a/Intuit.QuickBase.Client/QuickBase.cs
+++ b/Intuit.QuickBase.Client/QuickBase.cs
@@ -18,7 +18,7 @@ public static AppDtm GetApplicationDataTimeInfo(string accountDomain, string app
 
         public static IQClient Login(string clientUserName, string clientPassword, string adminUserName, string adminPassword, string accountDomain, int hours)
         {
-            var clientFactory = QClientFactory.GetInstance();
+            QClientFactoryBase clientFactory = QClientFactory.GetInstance();
             return clientFactory.CreateInstance(clientUserName, clientPassword, adminUserName, adminPassword, accountDomain, hours);
         }
 
diff --git a/Intuit.QuickBase.Client/packages.config b/Intuit.QuickBase.Client/packages.config
new file mode 100644
index 0000000..e5b4424
--- /dev/null
+++ b/Intuit.QuickBase.Client/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.CodeAnalysis.NetAnalyzers" version="6.0.0" targetFramework="net462" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/AddField.cs b/Intuit.QuickBase.Core/AddField.cs
index 9e0536d..2726264 100644
--- a/Intuit.QuickBase.Core/AddField.cs
+++ b/Intuit.QuickBase.Core/AddField.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -37,9 +38,9 @@ public sealed class AddField : IQObject
         /// <param name="label"></param>
         /// <param name="type"></param>
         /// <param name="mode"></param>
-        public AddField(string ticket, string appToken, string accountDomain, string dbid, string label, FieldType type, Mode mode)
+        public AddField(string ticket, string appToken, string accountDomain, string dbid, string label, FieldType type, Mode mode, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new AddFieldPayload(label, type, mode));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new AddFieldPayload(label, type, mode), userToken);
         }
 
         /// <summary>
@@ -51,25 +52,30 @@ public AddField(string ticket, string appToken, string accountDomain, string dbi
         /// <param name="dbid">Supply table-level dbid.</param>
         /// <param name="label"></param>
         /// <param name="type"></param>
-        public AddField(string ticket, string appToken, string accountDomain, string dbid, string label, FieldType type)
+        /// <param name="userToken">an optional user token that can be used instead of a ticket</param>
+        public AddField(string ticket, string appToken, string accountDomain, string dbid, string label, FieldType type, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new AddFieldPayload(label, type));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new AddFieldPayload(label, type), userToken);
         }
 
-        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload)
+        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload, string userToken = "")
         {
-            _addFieldPayload = new ApplicationTicket(payload, ticket);
+            if (userToken.Length > 0)
+            {
+                _addFieldPayload = new ApplicationUserToken(payload, userToken);
+            }
+            else
+            {
+                _addFieldPayload = new ApplicationTicket(payload, ticket);
+            }
             _addFieldPayload = new ApplicationToken(_addFieldPayload, appToken);
             _addFieldPayload = new WrapPayload(_addFieldPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _addFieldPayload.GetXmlPayload();
-            }
+            _addFieldPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -88,7 +94,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/AddRecord.cs b/Intuit.QuickBase.Core/AddRecord.cs
index 981d7ef..df23445 100644
--- a/Intuit.QuickBase.Core/AddRecord.cs
+++ b/Intuit.QuickBase.Core/AddRecord.cs
@@ -7,7 +7,7 @@
  */
 using System;
 using System.Collections.Generic;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -31,6 +31,7 @@ public class Builder
             private List<IField> _fields;
 
             internal string Ticket { get; set; }
+            internal string UserToken { get; set; }
             internal string AppToken { get; set; }
             internal string AccountDomain { get; set; }
             internal string Dbid { get; set; }
@@ -47,15 +48,17 @@ internal List<IField> Fields
                 }
             }
 
-            public Builder(string ticket, string appToken, string accountDomain, string dbid, List<IField> fields)
+            public Builder(string ticket, string appToken, string accountDomain, string dbid, List<IField> fields, string userToken = "")
             {
                 Ticket = ticket;
+                UserToken = userToken;
                 AppToken = appToken;
                 AccountDomain = accountDomain;
                 Dbid = dbid;
                 Fields = fields;
             }
 
+
             internal bool Disprec { get; private set; }
 
             public Builder SetDisprec(bool val)
@@ -64,6 +67,14 @@ public Builder SetDisprec(bool val)
                 return this;
             }
 
+            internal bool TimeInUtc { get; private set; }
+
+            public Builder SetTimeInUtc(bool val)
+            {
+                TimeInUtc = val;
+                return this;
+            }
+
             internal bool Fform { get; private set; }
 
             public Builder SetFform(bool val)
@@ -82,20 +93,25 @@ private AddRecord(Builder builder)
         {
             _addRecordPayload = new AddRecordPayload.Builder(builder.Fields)
                 .SetDisprec(builder.Disprec)
+                .SetTimeInUtc(builder.TimeInUtc)
                 .SetFform(builder.Fform)
                 .Build();
-            _addRecordPayload = new ApplicationTicket(_addRecordPayload, builder.Ticket);
+            if (builder.UserToken.Length > 0)
+            {
+                _addRecordPayload = new ApplicationUserToken(_addRecordPayload, builder.UserToken);
+            }
+            else
+            {
+                _addRecordPayload = new ApplicationTicket(_addRecordPayload, builder.Ticket);
+            }
             _addRecordPayload = new ApplicationToken(_addRecordPayload, builder.AppToken);
             _addRecordPayload = new WrapPayload(_addRecordPayload);
             _uri = new QUriDbid(builder.AccountDomain, builder.Dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _addRecordPayload.GetXmlPayload();
-            }
+            _addRecordPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -114,7 +130,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/AddReplaceDBPage.cs b/Intuit.QuickBase.Core/AddReplaceDBPage.cs
index 8f6dda7..9a66237 100644
--- a/Intuit.QuickBase.Core/AddReplaceDBPage.cs
+++ b/Intuit.QuickBase.Core/AddReplaceDBPage.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,30 +18,34 @@ public class AddReplaceDBPage : IQObject
         private Payload.Payload _addReplaceDBPagePayload;
         private IQUri _uri;
 
-        public AddReplaceDBPage(string ticket, string appToken, string accountDomain, string dbid, string pageName, PageType pageType, string pageBody)
+        public AddReplaceDBPage(string ticket, string appToken, string accountDomain, string dbid, string pageName, PageType pageType, string pageBody, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new AddReplaceDBPagePayload(pageName, pageType, pageBody));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new AddReplaceDBPagePayload(pageName, pageType, pageBody), userToken);
         }
 
-        public AddReplaceDBPage(string ticket, string appToken, string accountDomain, string dbid, int pageId, PageType pageType, string pageBody)
+        public AddReplaceDBPage(string ticket, string appToken, string accountDomain, string dbid, int pageId, PageType pageType, string pageBody, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new AddReplaceDBPagePayload(pageId, pageType, pageBody));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new AddReplaceDBPagePayload(pageId, pageType, pageBody), userToken);
         }
 
-        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload)
+        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload, string userToken = "")
         {
-            _addReplaceDBPagePayload = new ApplicationTicket(payload, ticket);
+            if (userToken.Length > 0)
+            {
+                _addReplaceDBPagePayload = new ApplicationUserToken(payload, userToken);
+            }
+            else
+            {
+                _addReplaceDBPagePayload = new ApplicationTicket(payload, ticket);
+            }
             _addReplaceDBPagePayload = new ApplicationToken(_addReplaceDBPagePayload, appToken);
             _addReplaceDBPagePayload = new WrapPayload(_addReplaceDBPagePayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _addReplaceDBPagePayload.GetXmlPayload();
-            }
+            _addReplaceDBPagePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -59,7 +64,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/AddUserToRole.cs b/Intuit.QuickBase.Core/AddUserToRole.cs
index 98b71f3..55dc1cd 100644
--- a/Intuit.QuickBase.Core/AddUserToRole.cs
+++ b/Intuit.QuickBase.Core/AddUserToRole.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,21 +18,26 @@ public class AddUserToRole : IQObject
         private readonly Payload.Payload _addUserToRolePayload;
         private readonly IQUri _uri;
 
-        public AddUserToRole(string ticket, string appToken, string accountDomain, string dbid, string userId, int roleId)
+        public AddUserToRole(string ticket, string appToken, string accountDomain, string dbid, string userId, int roleId, string userToken = "")
         {
             _addUserToRolePayload = new AddUserToRolePayload(userId, roleId);
-            _addUserToRolePayload = new ApplicationTicket(_addUserToRolePayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _addUserToRolePayload = new ApplicationUserToken(_addUserToRolePayload, userToken);
+            }
+            else
+            {
+                _addUserToRolePayload = new ApplicationTicket(_addUserToRolePayload, ticket);
+            }
             _addUserToRolePayload = new ApplicationToken(_addUserToRolePayload, appToken);
             _addUserToRolePayload = new WrapPayload(_addUserToRolePayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _addUserToRolePayload.GetXmlPayload();
-            }
+            _addUserToRolePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -50,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/Authenticate.cs b/Intuit.QuickBase.Core/Authenticate.cs
index e92bdeb..985de49 100644
--- a/Intuit.QuickBase.Core/Authenticate.cs
+++ b/Intuit.QuickBase.Core/Authenticate.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -63,12 +64,9 @@ private void CommonConstruction(Payload.Payload payload, string accountDomain)
             _uri = new QUriMain(accountDomain);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _authenticatePayload.GetXmlPayload();
-            }
+            _authenticatePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -87,7 +85,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/ChangeRecordOwner.cs b/Intuit.QuickBase.Core/ChangeRecordOwner.cs
index d7b4015..c86b21f 100644
--- a/Intuit.QuickBase.Core/ChangeRecordOwner.cs
+++ b/Intuit.QuickBase.Core/ChangeRecordOwner.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,21 +18,26 @@ public class ChangeRecordOwner : IQObject
         private readonly Payload.Payload _changeRecordOwnerPayload;
         private readonly IQUri _uri;
 
-        public ChangeRecordOwner(string ticket, string appToken, string accountDomain, string dbid, int rid, string newOwner)
+        public ChangeRecordOwner(string ticket, string appToken, string accountDomain, string dbid, int rid, string newOwner, string userToken = "")
         {
             _changeRecordOwnerPayload = new ChangeRecordOwnerPayload(rid, newOwner);
-            _changeRecordOwnerPayload = new ApplicationTicket(_changeRecordOwnerPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _changeRecordOwnerPayload = new ApplicationUserToken(_changeRecordOwnerPayload, userToken);
+            }
+            else
+            {
+                _changeRecordOwnerPayload = new ApplicationTicket(_changeRecordOwnerPayload, ticket);
+            }
             _changeRecordOwnerPayload = new ApplicationToken(_changeRecordOwnerPayload, appToken);
             _changeRecordOwnerPayload = new WrapPayload(_changeRecordOwnerPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _changeRecordOwnerPayload.GetXmlPayload();
-            }
+            _changeRecordOwnerPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -50,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/ChangeUserRole.cs b/Intuit.QuickBase.Core/ChangeUserRole.cs
index 9a07c44..11f0129 100644
--- a/Intuit.QuickBase.Core/ChangeUserRole.cs
+++ b/Intuit.QuickBase.Core/ChangeUserRole.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,31 +18,36 @@ public class ChangeUserRole : IQObject
         private Payload.Payload _changeUserRolePayload;
         private IQUri _uri;
 
-        public ChangeUserRole(string ticket, string appToken, string accountDomain, string dbid, string userId, int currentRoleId, int newRoldId)
+        public ChangeUserRole(string ticket, string appToken, string accountDomain, string dbid, string userId, int currentRoleId, int newRoldId, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new ChangeUserRolePayload(userId, currentRoleId, newRoldId));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new ChangeUserRolePayload(userId, currentRoleId, newRoldId), userToken);
 
         }
 
-        public ChangeUserRole(string ticket, string appToken, string accountDomain, string dbid, string userId, int currentRoleId)
+        public ChangeUserRole(string ticket, string appToken, string accountDomain, string dbid, string userId, int currentRoleId, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new ChangeUserRolePayload(userId, currentRoleId));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new ChangeUserRolePayload(userId, currentRoleId), userToken);
         }
 
-        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload)
+        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload, string userToken = "")
         {
-            _changeUserRolePayload = new ApplicationTicket(payload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _changeUserRolePayload = new ApplicationUserToken(payload, userToken);
+            }
+            else
+            {
+                _changeUserRolePayload = new ApplicationTicket(payload, ticket);
+            }
             _changeUserRolePayload = new ApplicationToken(_changeUserRolePayload, appToken);
             _changeUserRolePayload = new WrapPayload(_changeUserRolePayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _changeUserRolePayload.GetXmlPayload();
-            }
+            _changeUserRolePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -60,7 +66,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/CloneDatabase.cs b/Intuit.QuickBase.Core/CloneDatabase.cs
index 361940d..6f05114 100644
--- a/Intuit.QuickBase.Core/CloneDatabase.cs
+++ b/Intuit.QuickBase.Core/CloneDatabase.cs
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -34,6 +34,7 @@ public class Builder
             private string _newDBDesc;
 
             internal string Ticket { get; set; }
+            internal string UserToken { get; set; }
             internal string AppToken { get; set; }
             internal string AccountDomain { get; set; }
             internal string Dbid { get; set; }
@@ -65,9 +66,10 @@ internal string NewDBDesc
                 }
             }
 
-            public Builder(string ticket, string appToken, string accountDomain, string dbid, string newDBName, string newDBDesc)
+            public Builder(string ticket, string appToken, string accountDomain, string dbid, string newDBName, string newDBDesc, string userToken = "")
             {
                 Ticket = ticket;
+                UserToken = userToken;
                 AppToken = appToken;
                 AccountDomain = accountDomain;
                 Dbid = dbid;
@@ -103,18 +105,23 @@ private CloneDatabase(Builder builder)
                 .SetKeepData(builder.KeepData)
                 .SetExcludeFiles(builder.ExcludeFiles)
                 .Build();
-            _cloneDatabasePayload = new ApplicationTicket(_cloneDatabasePayload, builder.Ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (builder.UserToken.Length > 0)
+            {
+                _cloneDatabasePayload = new ApplicationUserToken(_cloneDatabasePayload, builder.UserToken);
+            }
+            else
+            {
+                _cloneDatabasePayload = new ApplicationTicket(_cloneDatabasePayload, builder.Ticket);
+            }
             _cloneDatabasePayload = new ApplicationToken(_cloneDatabasePayload, builder.AppToken);
             _cloneDatabasePayload = new WrapPayload(_cloneDatabasePayload);
             _uri = new QUriDbid(builder.AccountDomain, builder.Dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _cloneDatabasePayload.GetXmlPayload();
-            }
+            _cloneDatabasePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -133,7 +140,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/CreateDatabase.cs b/Intuit.QuickBase.Core/CreateDatabase.cs
index 97028a7..7e23c8b 100644
--- a/Intuit.QuickBase.Core/CreateDatabase.cs
+++ b/Intuit.QuickBase.Core/CreateDatabase.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -46,20 +47,26 @@ public class CreateDatabase : IQObject
         /// <param name="dbName">Supply a new application name.</param>
         /// <param name="dbDesc">Supply an application description.</param>
         /// <param name="createAppToken">Supply "true" to create a new token, "false" otherwise.</param>
-        public CreateDatabase(string ticket, string accountDomain, string dbName, string dbDesc, bool createAppToken)
+        /// <param name="userToken">a user token that can be used instead of a ticket</param>
+        public CreateDatabase(string ticket, string accountDomain, string dbName, string dbDesc, bool createAppToken, string userToken = "")
         {
             _createDatabasePayload = new CreateDatabasePayload(dbName, dbDesc, createAppToken);
-            _createDatabasePayload = new ApplicationTicket(_createDatabasePayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _createDatabasePayload = new ApplicationUserToken(_createDatabasePayload, userToken);
+            }
+            else
+            {
+                _createDatabasePayload = new ApplicationTicket(_createDatabasePayload, ticket);
+            }
             _createDatabasePayload = new WrapPayload(_createDatabasePayload);
             _uri = new QUriMain(accountDomain);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _createDatabasePayload.GetXmlPayload();
-            }
+            _createDatabasePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -78,7 +85,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/CreateTable.cs b/Intuit.QuickBase.Core/CreateTable.cs
index a6f2ccd..7cede3f 100644
--- a/Intuit.QuickBase.Core/CreateTable.cs
+++ b/Intuit.QuickBase.Core/CreateTable.cs
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -30,13 +30,15 @@ public class CreateTable : IQObject
         public class Builder
         {
             internal string Ticket { get; set; }
+            internal string UserToken { get; set; }
             internal string AppToken { get; set; }
             internal string AccountDomain { get; set; }
             internal string Dbid { get; set; }
 
-            public Builder(string ticket, string appToken, string accountDomain, string dbid)
+            public Builder(string ticket, string appToken, string accountDomain, string dbid, string userToken = "")
             {
                 Ticket = ticket;
+                UserToken = userToken;
                 AppToken = appToken;
                 AccountDomain = accountDomain;
                 Dbid = dbid;
@@ -74,18 +76,23 @@ private CreateTable(Builder builder)
                 .SetTName(builder.TName)
                 .SetPNoun(builder.PNoun)
                 .Build();
-            _createTablePayload = new ApplicationTicket(_createTablePayload, builder.Ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (builder.UserToken.Length > 0)
+            {
+                _createTablePayload = new ApplicationUserToken(_createTablePayload, builder.UserToken);
+            }
+            else
+            {
+                _createTablePayload = new ApplicationTicket(_createTablePayload, builder.Ticket);
+            }
             _createTablePayload = new ApplicationToken(_createTablePayload, builder.AppToken);
             _createTablePayload = new WrapPayload(_createTablePayload);
             _uri = new QUriDbid(builder.AccountDomain, builder.Dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _createTablePayload.GetXmlPayload();
-            }
+            _createTablePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -104,7 +111,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/DeleteDatabase.cs b/Intuit.QuickBase.Core/DeleteDatabase.cs
index b9a39f1..882559d 100644
--- a/Intuit.QuickBase.Core/DeleteDatabase.cs
+++ b/Intuit.QuickBase.Core/DeleteDatabase.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -30,21 +31,27 @@ public class DeleteDatabase : IQObject
         /// <param name="appToken">Supply application token that is assigned to your QuickBase Application. See QuickBase Online help to obtain an application token.</param>
         /// <param name="accountDomain"></param>
         /// <param name="dbid">Supply application-level or table-level dbid.</param>
-        public DeleteDatabase(string ticket, string appToken, string accountDomain, string dbid)
+        /// <param name="userToken">optional user token that can be used instead of a ticket</param>
+        public DeleteDatabase(string ticket, string appToken, string accountDomain, string dbid, string userToken = "")
         {
             _deleteDatabasePayload = new DeleteDatabasePayload();
-            _deleteDatabasePayload = new ApplicationTicket(_deleteDatabasePayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _deleteDatabasePayload = new ApplicationUserToken(_deleteDatabasePayload, userToken);
+            }
+            else
+            {
+                _deleteDatabasePayload = new ApplicationTicket(_deleteDatabasePayload, ticket);
+            }
             _deleteDatabasePayload = new ApplicationToken(_deleteDatabasePayload, appToken);
             _deleteDatabasePayload = new WrapPayload(_deleteDatabasePayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _deleteDatabasePayload.GetXmlPayload();
-            }
+            _deleteDatabasePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -63,7 +70,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/DeleteField.cs b/Intuit.QuickBase.Core/DeleteField.cs
index 7723585..571ed7a 100644
--- a/Intuit.QuickBase.Core/DeleteField.cs
+++ b/Intuit.QuickBase.Core/DeleteField.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -33,21 +34,27 @@ public class DeleteField : IQObject
         /// <param name="accountDomain"></param>
         /// <param name="dbid">Supply table-level dbid.</param>
         /// <param name="fid">Supply a column object.</param>
-        public DeleteField(string ticket, string appToken, string accountDomain, string dbid, int fid)
+        /// <param name="userToken">optional user token that can be used instead of a ticket</param>
+        public DeleteField(string ticket, string appToken, string accountDomain, string dbid, int fid, string userToken = "")
         {
             _deleteFieldPayload = new DeleteFieldPayload(fid);
-            _deleteFieldPayload = new ApplicationTicket(_deleteFieldPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _deleteFieldPayload = new ApplicationUserToken(_deleteFieldPayload, userToken);
+            }
+            else
+            {
+                _deleteFieldPayload = new ApplicationTicket(_deleteFieldPayload, ticket);
+            }
             _deleteFieldPayload = new ApplicationToken(_deleteFieldPayload, appToken);
             _deleteFieldPayload = new WrapPayload(_deleteFieldPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _deleteFieldPayload.GetXmlPayload();
-            }
+            _deleteFieldPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -66,7 +73,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/DeleteRecord.cs b/Intuit.QuickBase.Core/DeleteRecord.cs
index 01945ea..2fd9fa1 100644
--- a/Intuit.QuickBase.Core/DeleteRecord.cs
+++ b/Intuit.QuickBase.Core/DeleteRecord.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -30,21 +31,27 @@ public class DeleteRecord : IQObject
         /// <param name="accountDomain"></param>
         /// <param name="dbid">Supply table-level dbid.</param>
         /// <param name="rid">Supply a record object.</param>
-        public DeleteRecord(string ticket, string appToken, string accountDomain, string dbid, int rid)
+        /// <param name="userToken">optional user token that can be used instead of a ticket</param>
+        public DeleteRecord(string ticket, string appToken, string accountDomain, string dbid, int rid, string userToken = "")
         {
             _deleteRecordPayload = new DeleteRecordPayload(rid);
-            _deleteRecordPayload = new ApplicationTicket(_deleteRecordPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _deleteRecordPayload = new ApplicationUserToken(_deleteRecordPayload, userToken);
+            }
+            else
+            {
+                _deleteRecordPayload = new ApplicationTicket(_deleteRecordPayload, ticket);
+            }
             _deleteRecordPayload = new ApplicationToken(_deleteRecordPayload, appToken);
             _deleteRecordPayload = new WrapPayload(_deleteRecordPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _deleteRecordPayload.GetXmlPayload();
-            }
+            _deleteRecordPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -63,7 +70,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/DoQuery.cs b/Intuit.QuickBase.Core/DoQuery.cs
index 109b620..9bd7478 100644
--- a/Intuit.QuickBase.Core/DoQuery.cs
+++ b/Intuit.QuickBase.Core/DoQuery.cs
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -25,68 +25,74 @@ public class DoQuery : IQObject
         private const string QUICKBASE_ACTION = "API_DoQuery";
         private readonly Payload.Payload _doQueryPayload;
         private readonly IQUri _uri;
+        private readonly string _options;
+        private readonly string _query;
+        private readonly string _collist;
 
         public class Builder
         {
             internal string Ticket { get; set; }
+            internal string UserToken { get; set; }
             internal string AppToken { get; set; }
             internal string AccountDomain { get; set; }
             internal string Dbid { get; set; }
 
-            public Builder(string ticket, string appToken, string accountDomain, string dbid)
+            public Builder(string ticket, string appToken, string accountDomain, string dbid, string userToken = "")
             {
                 Ticket = ticket;
+                UserToken = userToken;
                 AppToken = appToken;
                 AccountDomain = accountDomain;
                 Dbid = dbid;
             }
 
+
             internal string Query { get; private set; }
 
-            public Builder SetQuery(string val)
+            public Builder SetQuery(string query)
             {
-                if (val == null) throw new ArgumentNullException("query");
-                if (val.Trim() == String.Empty) throw new ArgumentException("query");
-                Query = val;
+                if (query == null) throw new ArgumentNullException(nameof(query));
+                if (query.Trim() == String.Empty) throw new ArgumentException("query is empty after whitespace trim");
+                Query = query;
                 return this;
             }
 
             internal int Qid { get; private set; }
 
-            public Builder SetQid(int val)
+            public Builder SetQid(int qid)
             {
-                if (val < 1) throw new ArgumentException("qid");
-                Qid = val;
+                if (qid < 1) throw new ArgumentException("Invalid QB Id");
+                Qid = qid;
                 return this;
             }
 
             internal string QName { get; private set; }
 
-            public Builder SetQName(string val)
+            public Builder SetQName(string qName)
             {
-                if (val == null) throw new ArgumentNullException("qName");
-                if (val.Trim() == String.Empty) throw new ArgumentException("qName");
-                QName = val;
+                if (qName == null) throw new ArgumentNullException(nameof(qName));
+                if (qName.Trim() == String.Empty) throw new ArgumentException("qName is empty after whitespace trim");
+                QName = qName;
                 return this;
             }
 
             internal string CList { get; private set; }
 
-            public Builder SetCList(string val)
+            public Builder SetCList(string cList)
             {
-                if (val == null) throw new ArgumentNullException("cList");
-                if (val.Trim() == String.Empty) throw new ArgumentException("cList");
-                CList = val;
+                if (cList == null) throw new ArgumentNullException(nameof(cList));
+                if (cList.Trim() == String.Empty) throw new ArgumentException("cList is empty after whitespace trim");
+                CList = cList;
                 return this;
             }
 
             internal string SList { get; private set; }
 
-            public Builder SetSList(string val)
+            public Builder SetSList(string sList)
             {
-                if (val == null) throw new ArgumentNullException("sList");
-                if (val.Trim() == String.Empty) throw new ArgumentException("sList");
-                SList = val;
+                if (sList == null) throw new ArgumentNullException(nameof(sList));
+                if (sList.Trim() == String.Empty) throw new ArgumentException("sList is empty after whitespace trim");
+                SList = sList;
                 return this;
             }
 
@@ -100,11 +106,11 @@ public Builder SetFmt(bool val)
 
             internal string Options { get; private set; }
 
-            public Builder SetOptions(string val)
+            public Builder SetOptions(string opts)
             {
-                if (val == null) throw new ArgumentNullException("options");
-                if (val.Trim() == String.Empty) throw new ArgumentException("options");
-                Options = val;
+                if (opts == null) throw new ArgumentNullException(nameof(opts));
+                if (opts.Trim() == String.Empty) throw new ArgumentException("opts empty after whitespace trim");
+                Options = opts;
                 return this;
             }
 
@@ -125,18 +131,41 @@ private DoQuery(Builder builder)
                 .SetFmt(builder.Fmt)
                 .SetOptions(builder.Options)
                 .Build();
-            _doQueryPayload = new ApplicationTicket(_doQueryPayload, builder.Ticket);
+            _options = builder.Options;
+            _query = builder.Query;
+            _collist = builder.CList;
+            //If a user token is provided, use it instead of a ticket
+            if (builder.UserToken.Length > 0)
+            {
+                _doQueryPayload = new ApplicationUserToken(_doQueryPayload, builder.UserToken);
+            }
+            else
+            {
+                _doQueryPayload = new ApplicationTicket(_doQueryPayload, builder.Ticket);
+            }
             _doQueryPayload = new ApplicationToken(_doQueryPayload, builder.AppToken);
             _doQueryPayload = new WrapPayload(_doQueryPayload);
             _uri = new QUriDbid(builder.AccountDomain, builder.Dbid);
         }
 
-        public string XmlPayload
+        public string Options
         {
-            get
-            {
-                return _doQueryPayload.GetXmlPayload();
-            }
+            get { return _options; }
+        }
+
+        public string Query
+        {
+            get { return _query; }
+        }
+
+        public string Collist
+        {
+           get { return _collist; }
+        }
+
+        public void BuildXmlPayload(ref XElement parent)
+        {
+            _doQueryPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -155,7 +184,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/DoQueryCount.cs b/Intuit.QuickBase.Core/DoQueryCount.cs
index f1395ca..e969153 100644
--- a/Intuit.QuickBase.Core/DoQueryCount.cs
+++ b/Intuit.QuickBase.Core/DoQueryCount.cs
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -21,13 +21,15 @@ public class DoQueryCount : IQObject
         public class Builder
         {
             internal string Ticket { get; set; }
+            internal string UserToken { get; set; }
             internal string AppToken { get; set; }
             internal string AccountDomain { get; set; }
             internal string Dbid { get; set; }
 
-            public Builder(string ticket, string appToken, string accountDomain, string dbid)
+            public Builder(string ticket, string appToken, string accountDomain, string dbid, string userToken = "")
             {
                 Ticket = ticket;
+                UserToken = userToken;
                 AppToken = appToken;
                 AccountDomain = accountDomain;
                 Dbid = dbid;
@@ -75,18 +77,23 @@ private DoQueryCount(Builder builder)
                 .SetQid(builder.Qid)
                 .SetQName(builder.QName)
                 .Build();
-            _doQueryCountPayload = new ApplicationTicket(_doQueryCountPayload, builder.Ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (builder.UserToken.Length > 0)
+            {
+                _doQueryCountPayload = new ApplicationUserToken(_doQueryCountPayload, builder.UserToken);
+            }
+            else
+            {
+                _doQueryCountPayload = new ApplicationTicket(_doQueryCountPayload, builder.Ticket);
+            }
             _doQueryCountPayload = new ApplicationToken(_doQueryCountPayload, builder.AppToken);
             _doQueryCountPayload = new WrapPayload(_doQueryCountPayload);
             _uri = new QUriDbid(builder.AccountDomain, builder.Dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _doQueryCountPayload.GetXmlPayload();
-            }
+            _doQueryCountPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -105,7 +112,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/DownloadFile.cs b/Intuit.QuickBase.Core/DownloadFile.cs
index e8b710e..a9c8190 100644
--- a/Intuit.QuickBase.Core/DownloadFile.cs
+++ b/Intuit.QuickBase.Core/DownloadFile.cs
@@ -12,6 +12,7 @@ namespace Intuit.QuickBase.Core
     public class DownloadFile
     {
         private string _ticket;
+        private string _userToken;
         private string _accountDomain;
         private string _path;
         private string _file;
@@ -20,14 +21,15 @@ public class DownloadFile
         private int _fieldId;
         private int _versionId;
 
-        public DownloadFile(string ticket, string accountDomain, string path, string file, string tableId, int recordId, int fieldId)
-            : this(ticket, accountDomain, path, file, tableId, recordId, fieldId, 0)
+        public DownloadFile(string ticket, string accountDomain, string path, string file, string tableId, int recordId, int fieldId, string userToken = "")
+            : this(ticket, accountDomain, path, file, tableId, recordId, fieldId, 0, userToken)
         {
         }
 
-        public DownloadFile(string ticket, string accountDomain, string path, string file, string tableId, int recordId, int fieldId, int versionId)
+        public DownloadFile(string ticket, string accountDomain, string path, string file, string tableId, int recordId, int fieldId, int versionId, string userToken = "")
         {
             Ticket = ticket;
+            UserToken = userToken;
             AccountDomain = accountDomain;
             Path = path;
             File = file;
@@ -48,6 +50,17 @@ public string Ticket
             }
         }
 
+        public string UserToken
+        {
+            get { return _userToken; }
+            set
+            {
+                if (value == null) throw new ArgumentNullException("usertoken");
+                if (value.Trim() == String.Empty) throw new ArgumentException("usertoken");
+                _userToken = value;
+            }
+        }
+
         public string AccountDomain
         {
             get { return _accountDomain; }
diff --git a/Intuit.QuickBase.Core/EditRecord.cs b/Intuit.QuickBase.Core/EditRecord.cs
index e8e5499..91baa84 100644
--- a/Intuit.QuickBase.Core/EditRecord.cs
+++ b/Intuit.QuickBase.Core/EditRecord.cs
@@ -7,7 +7,7 @@
  */
 using System;
 using System.Collections.Generic;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -31,6 +31,7 @@ public class Builder
             private int _rid;
 
             internal string Ticket { get; set; }
+            internal string UserToken { get; set; }
             internal string AppToken { get; set; }
             internal string AccountDomain { get; set; }
             internal string Dbid { get; set; }
@@ -59,9 +60,10 @@ internal List<IField> Fields
                 }
             }
 
-            public Builder(string ticket, string appToken, string accountDomain, string dbid, int rid, List<IField> fields)
+            public Builder(string ticket, string appToken, string accountDomain, string dbid, int rid, List<IField> fields, string userToken = "")
             {
                 Ticket = ticket;
+                UserToken = userToken;
                 AppToken = appToken;
                 AccountDomain = accountDomain;
                 Dbid = dbid;
@@ -85,6 +87,14 @@ public Builder SetDisprec(bool val)
                 return this;
             }
 
+            internal bool TimeInUtc { get; private set; }
+
+            public Builder SetTimeInUtc(bool val)
+            {
+                TimeInUtc = val;
+                return this;
+            }
+
             internal bool Fform { get; private set; }
 
             public Builder SetFform(bool val)
@@ -104,20 +114,26 @@ private EditRecord(Builder builder)
             _editRecordPayload = new EditRecordPayload.Builder(builder.Rid, builder.Fields)
                 .SetUpdateId(builder.UpdateId)
                 .SetDisprec(builder.Disprec)
+                .SetTimeInUtc(builder.TimeInUtc)
                 .SetFform(builder.Fform)
                 .Build();
-            _editRecordPayload = new ApplicationTicket(_editRecordPayload, builder.Ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (builder.UserToken.Length > 0)
+            {
+                _editRecordPayload = new ApplicationUserToken(_editRecordPayload, builder.UserToken);
+            }
+            else
+            {
+                _editRecordPayload = new ApplicationTicket(_editRecordPayload, builder.Ticket);
+            }
             _editRecordPayload = new ApplicationToken(_editRecordPayload, builder.AppToken);
             _editRecordPayload = new WrapPayload(_editRecordPayload);
             _uri = new QUriDbid(builder.AccountDomain, builder.Dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _editRecordPayload.GetXmlPayload();
-            }
+            _editRecordPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -136,7 +152,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/Exceptions/APINotAllowedOnApplicationTableException.cs b/Intuit.QuickBase.Core/Exceptions/APINotAllowedOnApplicationTableException.cs
index 5fe57a0..e6cd0aa 100644
--- a/Intuit.QuickBase.Core/Exceptions/APINotAllowedOnApplicationTableException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/APINotAllowedOnApplicationTableException.cs
@@ -6,18 +6,20 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class ApiNotAllowedOnApplicationTableException : Exception
     {
-        public ApiNotAllowedOnApplicationTableException() { }
+        public ApiNotAllowedOnApplicationTableException() : base() { }
 
-        public ApiNotAllowedOnApplicationTableException(string message)
-        {
-            Message = message;
-        }
+        public ApiNotAllowedOnApplicationTableException(string message) : base(message) { }
+
+        public ApiNotAllowedOnApplicationTableException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected ApiNotAllowedOnApplicationTableException(SerializationInfo info, StreamingContext context) : base(info, context) { }
 
-        public new string Message { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/APIRequestLimitExceededException.cs b/Intuit.QuickBase.Core/Exceptions/APIRequestLimitExceededException.cs
index a0623aa..f3ddad4 100644
--- a/Intuit.QuickBase.Core/Exceptions/APIRequestLimitExceededException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/APIRequestLimitExceededException.cs
@@ -6,18 +6,27 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class ApiRequestLimitExceededException : Exception
     {
-        public ApiRequestLimitExceededException() { }
+        public ApiRequestLimitExceededException() : base() { }
 
-        public ApiRequestLimitExceededException(string message)
+        public ApiRequestLimitExceededException(string message, DateTime waitUntil) : base(message)
         {
-            Message = message;
+            WaitUntil = waitUntil;
         }
 
-        public new string Message { get; set; }
+        public ApiRequestLimitExceededException(string message, Exception innerException, DateTime waitUntil) : base(message, innerException)
+        {
+            WaitUntil = waitUntil;
+        }
+
+        public DateTime WaitUntil { get; private set; }
+
+        protected ApiRequestLimitExceededException(SerializationInfo info, StreamingContext context) : base (info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/AccountSizeLimitExceededException.cs b/Intuit.QuickBase.Core/Exceptions/AccountSizeLimitExceededException.cs
index b42cebe..f7bfae4 100644
--- a/Intuit.QuickBase.Core/Exceptions/AccountSizeLimitExceededException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/AccountSizeLimitExceededException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class AccountSizeLimitExceededException : Exception
     {
-        public AccountSizeLimitExceededException() { }
+        public AccountSizeLimitExceededException() : base() { }
 
-        public AccountSizeLimitExceededException(string message)
-        {
-            Message = message;
-        }
+        public AccountSizeLimitExceededException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public AccountSizeLimitExceededException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected AccountSizeLimitExceededException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/AccountSuspendedException.cs b/Intuit.QuickBase.Core/Exceptions/AccountSuspendedException.cs
index c6244e3..c885965 100644
--- a/Intuit.QuickBase.Core/Exceptions/AccountSuspendedException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/AccountSuspendedException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class AccountSuspendedException : Exception
     {
-        public AccountSuspendedException() { }
+        public AccountSuspendedException() : base() { }
 
-        public AccountSuspendedException(string message)
-        {
-            Message = message;
-        }
+        public AccountSuspendedException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public AccountSuspendedException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected AccountSuspendedException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/ApplicationDoesNotExistOrDeletedException.cs b/Intuit.QuickBase.Core/Exceptions/ApplicationDoesNotExistOrDeletedException.cs
index d326282..6b31286 100644
--- a/Intuit.QuickBase.Core/Exceptions/ApplicationDoesNotExistOrDeletedException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/ApplicationDoesNotExistOrDeletedException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class ApplicationDoesNotExistOrDeletedException : Exception
     {
-        public ApplicationDoesNotExistOrDeletedException() { }
+        public ApplicationDoesNotExistOrDeletedException() : base() { }
 
-        public ApplicationDoesNotExistOrDeletedException(string message)
-        {
-            Message = message;
-        }
+        public ApplicationDoesNotExistOrDeletedException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public ApplicationDoesNotExistOrDeletedException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected ApplicationDoesNotExistOrDeletedException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/AttemptingToAddNonUniqueValueException.cs b/Intuit.QuickBase.Core/Exceptions/AttemptingToAddNonUniqueValueException.cs
index 62acca6..e681ddb 100644
--- a/Intuit.QuickBase.Core/Exceptions/AttemptingToAddNonUniqueValueException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/AttemptingToAddNonUniqueValueException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class AttemptingToAddNonUniqueValueException : Exception
     {
-        public AttemptingToAddNonUniqueValueException() { }
+        public AttemptingToAddNonUniqueValueException() : base() { }
 
-        public AttemptingToAddNonUniqueValueException(string message)
-        {
-            Message = message;
-        }
+        public AttemptingToAddNonUniqueValueException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public AttemptingToAddNonUniqueValueException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected AttemptingToAddNonUniqueValueException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/BadTicketException.cs b/Intuit.QuickBase.Core/Exceptions/BadTicketException.cs
index 64ed055..7b86721 100644
--- a/Intuit.QuickBase.Core/Exceptions/BadTicketException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/BadTicketException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class BadTicketException : Exception
     {
-        public BadTicketException() { }
+        public BadTicketException() : base() { }
 
-        public BadTicketException(string message)
-        {
-            Message = message;
-        }
+        public BadTicketException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public BadTicketException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected BadTicketException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/CachedRecordsNotFoundException.cs b/Intuit.QuickBase.Core/Exceptions/CachedRecordsNotFoundException.cs
index 8ad7f06..c5b922e 100644
--- a/Intuit.QuickBase.Core/Exceptions/CachedRecordsNotFoundException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/CachedRecordsNotFoundException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class CachedRecordsNotFoundException : Exception
     {
-        public CachedRecordsNotFoundException() { }
+        public CachedRecordsNotFoundException() : base() { }
 
-        public CachedRecordsNotFoundException(string message)
-        {
-            Message = message;
-        }
+        public CachedRecordsNotFoundException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public CachedRecordsNotFoundException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected CachedRecordsNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/CannotChangeValueOfFieldException.cs b/Intuit.QuickBase.Core/Exceptions/CannotChangeValueOfFieldException.cs
index 1ea5f63..a6536fc 100644
--- a/Intuit.QuickBase.Core/Exceptions/CannotChangeValueOfFieldException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/CannotChangeValueOfFieldException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class CannotChangeValueOfFieldException : Exception
     {
-        public CannotChangeValueOfFieldException() { }
+        public CannotChangeValueOfFieldException() : base() { }
 
-        public CannotChangeValueOfFieldException(string message)
-        {
-            Message = message;
-        }
+        public CannotChangeValueOfFieldException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public CannotChangeValueOfFieldException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected CannotChangeValueOfFieldException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/CloningException.cs b/Intuit.QuickBase.Core/Exceptions/CloningException.cs
index 5c4efb4..799524e 100644
--- a/Intuit.QuickBase.Core/Exceptions/CloningException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/CloningException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class CloningException : Exception
     {
-        public CloningException() { }
+        public CloningException() : base() { }
 
-        public CloningException(string message)
-        {
-            Message = message;
-        }
+        public CloningException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public CloningException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected CloningException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/ColumnDoesNotExistInTableExecption.cs b/Intuit.QuickBase.Core/Exceptions/ColumnDoesNotExistInTableExecption.cs
index 1a57985..9f96664 100644
--- a/Intuit.QuickBase.Core/Exceptions/ColumnDoesNotExistInTableExecption.cs
+++ b/Intuit.QuickBase.Core/Exceptions/ColumnDoesNotExistInTableExecption.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
-    public class ColumnDoesNotExistInTableExecption : Exception
+    [Serializable]
+    public class ColumnDoesNotExistInTableException : ArgumentException
     {
-        public ColumnDoesNotExistInTableExecption() { }
+        public ColumnDoesNotExistInTableException() : base() { }
 
-        public ColumnDoesNotExistInTableExecption(string message)
-        {
-            Message = message;
-        }
+        public ColumnDoesNotExistInTableException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public ColumnDoesNotExistInTableException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected ColumnDoesNotExistInTableException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/DatabaseSizeLimitExceededException.cs b/Intuit.QuickBase.Core/Exceptions/DatabaseSizeLimitExceededException.cs
index 8403cad..e62a18a 100644
--- a/Intuit.QuickBase.Core/Exceptions/DatabaseSizeLimitExceededException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/DatabaseSizeLimitExceededException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class DatabaseSizeLimitExceededException : Exception
     {
-        public DatabaseSizeLimitExceededException() { }
+        public DatabaseSizeLimitExceededException() : base() { }
 
-        public DatabaseSizeLimitExceededException(string message)
-        {
-            Message = message;
-        }
+        public DatabaseSizeLimitExceededException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public DatabaseSizeLimitExceededException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected DatabaseSizeLimitExceededException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/FeatureNotSupportedException.cs b/Intuit.QuickBase.Core/Exceptions/FeatureNotSupportedException.cs
index b052d4c..12296d2 100644
--- a/Intuit.QuickBase.Core/Exceptions/FeatureNotSupportedException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/FeatureNotSupportedException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class FeatureNotSupportedException : Exception
     {
-        public FeatureNotSupportedException() { }
+        public FeatureNotSupportedException() : base() { }
 
-        public FeatureNotSupportedException(string message)
-        {
-            Message = message;
-        }
+        public FeatureNotSupportedException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public FeatureNotSupportedException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected FeatureNotSupportedException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/FieldDoesNotExistInRecordException.cs b/Intuit.QuickBase.Core/Exceptions/FieldDoesNotExistInRecordException.cs
index 0bf8ef3..486fa70 100644
--- a/Intuit.QuickBase.Core/Exceptions/FieldDoesNotExistInRecordException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/FieldDoesNotExistInRecordException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class FieldDoesNotExistInRecordException : Exception
     {
-        public FieldDoesNotExistInRecordException() { }
+        public FieldDoesNotExistInRecordException() : base() { }
 
-        public FieldDoesNotExistInRecordException(string message)
-        {
-            Message = message;
-        }
+        public FieldDoesNotExistInRecordException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public FieldDoesNotExistInRecordException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected FieldDoesNotExistInRecordException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/InsufficientPermissionsException.cs b/Intuit.QuickBase.Core/Exceptions/InsufficientPermissionsException.cs
index 519c60b..9702f77 100644
--- a/Intuit.QuickBase.Core/Exceptions/InsufficientPermissionsException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/InsufficientPermissionsException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class InsufficientPermissionsException : Exception
     {
-        public InsufficientPermissionsException() { }
+        public InsufficientPermissionsException() : base() { }
 
-        public InsufficientPermissionsException(string message)
-        {
-            Message = message;
-        }
+        public InsufficientPermissionsException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public InsufficientPermissionsException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected InsufficientPermissionsException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/InvalidAccountIDException.cs b/Intuit.QuickBase.Core/Exceptions/InvalidAccountIDException.cs
index a07c6a4..e3d6720 100644
--- a/Intuit.QuickBase.Core/Exceptions/InvalidAccountIDException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/InvalidAccountIDException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class InvalidAccountIDException : Exception
     {
-        public InvalidAccountIDException() { }
+        public InvalidAccountIDException() : base() { }
 
-        public InvalidAccountIDException(string message)
-        {
-            Message = message;
-        }
+        public InvalidAccountIDException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public InvalidAccountIDException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected InvalidAccountIDException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/InvalidApplicationTokenException.cs b/Intuit.QuickBase.Core/Exceptions/InvalidApplicationTokenException.cs
index 9fd6115..6a1fad9 100644
--- a/Intuit.QuickBase.Core/Exceptions/InvalidApplicationTokenException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/InvalidApplicationTokenException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class InvalidApplicationTokenException : Exception
     {
-        public InvalidApplicationTokenException() { }
+        public InvalidApplicationTokenException() : base() { }
 
-        public InvalidApplicationTokenException(string message)
-        {
-            Message = message;
-        }
+        public InvalidApplicationTokenException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public InvalidApplicationTokenException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected InvalidApplicationTokenException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/InvalidChoiceException.cs b/Intuit.QuickBase.Core/Exceptions/InvalidChoiceException.cs
index bf8355a..75b3252 100644
--- a/Intuit.QuickBase.Core/Exceptions/InvalidChoiceException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/InvalidChoiceException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class InvalidChoiceException : Exception
     {
-        public InvalidChoiceException() { }
+        public InvalidChoiceException() : base() { }
 
-        public InvalidChoiceException(string message)
-        {
-            Message = message;
-        }
+        public InvalidChoiceException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public InvalidChoiceException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected InvalidChoiceException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/InvalidInputException.cs b/Intuit.QuickBase.Core/Exceptions/InvalidInputException.cs
index 1d21c32..b6bfc46 100644
--- a/Intuit.QuickBase.Core/Exceptions/InvalidInputException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/InvalidInputException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class InvalidInputException : Exception
     {
-        public InvalidInputException() { }
+        public InvalidInputException() : base() { }
 
-        public InvalidInputException(string message)
-        {
-            Message = message;
-        }
+        public InvalidInputException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public InvalidInputException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected InvalidInputException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/InvalidRoleException.cs b/Intuit.QuickBase.Core/Exceptions/InvalidRoleException.cs
index d10a5d3..81dbdd2 100644
--- a/Intuit.QuickBase.Core/Exceptions/InvalidRoleException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/InvalidRoleException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class InvalidRoleException : Exception
     {
-        public InvalidRoleException() { }
+        public InvalidRoleException() : base() { }
 
-        public InvalidRoleException(string message)
-        {
-            Message = message;
-        }
+        public InvalidRoleException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public InvalidRoleException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected InvalidRoleException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/InvalidSourceDBIDException.cs b/Intuit.QuickBase.Core/Exceptions/InvalidSourceDBIDException.cs
index e7720fe..a6544e3 100644
--- a/Intuit.QuickBase.Core/Exceptions/InvalidSourceDBIDException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/InvalidSourceDBIDException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class InvalidSourceDbidException : Exception
     {
-        public InvalidSourceDbidException() { }
+        public InvalidSourceDbidException() : base() { }
 
-        public InvalidSourceDbidException(string message)
-        {
-            Message = message;
-        }
+        public InvalidSourceDbidException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public InvalidSourceDbidException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected InvalidSourceDbidException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/ItemNotFoundException.cs b/Intuit.QuickBase.Core/Exceptions/ItemNotFoundException.cs
index 1874aae..c145f5c 100644
--- a/Intuit.QuickBase.Core/Exceptions/ItemNotFoundException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/ItemNotFoundException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class ItemNotFoundException : Exception
     {
-        public ItemNotFoundException() { }
+        public ItemNotFoundException() : base() { }
 
-        public ItemNotFoundException(string message)
-        {
-            Message = message;
-        }
+        public ItemNotFoundException(string message): base(message) { }
 
-        public new string Message { get; set; }
+        public ItemNotFoundException(string message, Exception  innerException): base(message, innerException) { } 
+
+        protected ItemNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/MissingDBIDOrWrongTypeException.cs b/Intuit.QuickBase.Core/Exceptions/MissingDBIDOrWrongTypeException.cs
index 3a13887..bc9c715 100644
--- a/Intuit.QuickBase.Core/Exceptions/MissingDBIDOrWrongTypeException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/MissingDBIDOrWrongTypeException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class MissingDbidOrWrongTypeException : Exception
     {
-        public MissingDbidOrWrongTypeException() { }
+        public MissingDbidOrWrongTypeException() : base() { }
 
-        public MissingDbidOrWrongTypeException(string message)
-        {
-            Message = message;
-        }
+        public MissingDbidOrWrongTypeException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public MissingDbidOrWrongTypeException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected MissingDbidOrWrongTypeException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/MissingRequiredFieldException.cs b/Intuit.QuickBase.Core/Exceptions/MissingRequiredFieldException.cs
index d5de71e..81ff721 100644
--- a/Intuit.QuickBase.Core/Exceptions/MissingRequiredFieldException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/MissingRequiredFieldException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class MissingRequiredFieldException : Exception
     {
-        public MissingRequiredFieldException() { }
+        public MissingRequiredFieldException() : base() { }
 
-        public MissingRequiredFieldException(string message)
-        {
-            Message = message;
-        }
+        public MissingRequiredFieldException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public MissingRequiredFieldException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected MissingRequiredFieldException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/NoDataReturnedException.cs b/Intuit.QuickBase.Core/Exceptions/NoDataReturnedException.cs
index 7850e96..41691f5 100644
--- a/Intuit.QuickBase.Core/Exceptions/NoDataReturnedException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/NoDataReturnedException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class NoDataReturnedException : Exception
     {
-        public NoDataReturnedException() { }
+        public NoDataReturnedException() : base() { }
 
-        public NoDataReturnedException(string message)
-        {
-            Message = message;
-        }
+        public NoDataReturnedException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public NoDataReturnedException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected NoDataReturnedException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/NoSuchDatabaseException.cs b/Intuit.QuickBase.Core/Exceptions/NoSuchDatabaseException.cs
index ab39d0b..63b6f1e 100644
--- a/Intuit.QuickBase.Core/Exceptions/NoSuchDatabaseException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/NoSuchDatabaseException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class NoSuchDatabaseException : Exception
     {
-        public NoSuchDatabaseException() { }
+        public NoSuchDatabaseException() : base() { }
 
-        public NoSuchDatabaseException(string message)
-        {
-            Message = message;
-        }
+        public NoSuchDatabaseException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public NoSuchDatabaseException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected NoSuchDatabaseException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/NoSuchFieldException.cs b/Intuit.QuickBase.Core/Exceptions/NoSuchFieldException.cs
index 7c0264c..f958312 100644
--- a/Intuit.QuickBase.Core/Exceptions/NoSuchFieldException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/NoSuchFieldException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class NoSuchFieldException : Exception
     {
-        public NoSuchFieldException() { }
+        public NoSuchFieldException() : base() { }
 
-        public NoSuchFieldException(string message)
-        {
-            Message = message;
-        }
+        public NoSuchFieldException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public NoSuchFieldException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected NoSuchFieldException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/NoSuchQueryException.cs b/Intuit.QuickBase.Core/Exceptions/NoSuchQueryException.cs
index 0c05bbc..9d65596 100644
--- a/Intuit.QuickBase.Core/Exceptions/NoSuchQueryException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/NoSuchQueryException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class NoSuchQueryException : Exception
     {
-        public NoSuchQueryException() { }
+        public NoSuchQueryException() : base() { }
 
-        public NoSuchQueryException(string message)
-        {
-            Message = message;
-        }
+        public NoSuchQueryException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public NoSuchQueryException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected NoSuchQueryException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/NoSuchRecordException.cs b/Intuit.QuickBase.Core/Exceptions/NoSuchRecordException.cs
index 08a159b..c3be7f8 100644
--- a/Intuit.QuickBase.Core/Exceptions/NoSuchRecordException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/NoSuchRecordException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class NoSuchRecordException : Exception
     {
-        public NoSuchRecordException() { }
+        public NoSuchRecordException() : base() { }
 
-        public NoSuchRecordException(string message)
-        {
-            Message = message;
-        }
+        public NoSuchRecordException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public NoSuchRecordException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected NoSuchRecordException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/NoSuchReportException.cs b/Intuit.QuickBase.Core/Exceptions/NoSuchReportException.cs
index ee9e0e1..b58948c 100644
--- a/Intuit.QuickBase.Core/Exceptions/NoSuchReportException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/NoSuchReportException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class NoSuchReportException : Exception
     {
-        public NoSuchReportException() { }
+        public NoSuchReportException() :base() { }
 
-        public NoSuchReportException(string message)
-        {
-            Message = message;
-        }
+        public NoSuchReportException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public NoSuchReportException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected NoSuchReportException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/NoUserInRoleException.cs b/Intuit.QuickBase.Core/Exceptions/NoUserInRoleException.cs
index 9133c8b..392f831 100644
--- a/Intuit.QuickBase.Core/Exceptions/NoUserInRoleException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/NoUserInRoleException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class NoUserInRoleException : Exception
     {
-        public NoUserInRoleException() { }
+        public NoUserInRoleException() : base() { }
 
-        public NoUserInRoleException(string message)
-        {
-            Message = message;
-        }
+        public NoUserInRoleException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public NoUserInRoleException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected NoUserInRoleException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/NotAllowedToCreateApplicationException.cs b/Intuit.QuickBase.Core/Exceptions/NotAllowedToCreateApplicationException.cs
index e8f684c..5e8afb1 100644
--- a/Intuit.QuickBase.Core/Exceptions/NotAllowedToCreateApplicationException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/NotAllowedToCreateApplicationException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class NotAllowedToCreateApplicationException : Exception
     {
-        public NotAllowedToCreateApplicationException() { }
+        public NotAllowedToCreateApplicationException() : base() { }
 
-        public NotAllowedToCreateApplicationException(string message)
-        {
-            Message = message;
-        }
+        public NotAllowedToCreateApplicationException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public NotAllowedToCreateApplicationException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected NotAllowedToCreateApplicationException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/OperationTookTooLongException.cs b/Intuit.QuickBase.Core/Exceptions/OperationTookTooLongException.cs
index 3c4e59a..b7a8b2c 100644
--- a/Intuit.QuickBase.Core/Exceptions/OperationTookTooLongException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/OperationTookTooLongException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class OperationTookTooLongException : Exception
     {
         public OperationTookTooLongException() { }
 
-        public OperationTookTooLongException(string message)
-        {
-            Message = message;
-        }
+        public OperationTookTooLongException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public OperationTookTooLongException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected OperationTookTooLongException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/OverflowException.cs b/Intuit.QuickBase.Core/Exceptions/OverflowException.cs
index 8db5f60..679a95f 100644
--- a/Intuit.QuickBase.Core/Exceptions/OverflowException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/OverflowException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class OverflowException : Exception
     {
-        public OverflowException() { }
+        public OverflowException() : base() { }
 
-        public OverflowException(string message)
-        {
-            Message = message;
-        }
+        public OverflowException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public OverflowException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected OverflowException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/PeriodicReportContainsRestrictedFieldException.cs b/Intuit.QuickBase.Core/Exceptions/PeriodicReportContainsRestrictedFieldException.cs
index 899fa4a..9817b2a 100644
--- a/Intuit.QuickBase.Core/Exceptions/PeriodicReportContainsRestrictedFieldException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/PeriodicReportContainsRestrictedFieldException.cs
@@ -6,20 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class PeriodicReportContainsRestrictedFieldException : Exception
     {
-        public PeriodicReportContainsRestrictedFieldException()
-        {
-        }
+        public PeriodicReportContainsRestrictedFieldException() : base() { }
 
-        public PeriodicReportContainsRestrictedFieldException(string message)
-        {
-            Message = message;
-        }
+        public PeriodicReportContainsRestrictedFieldException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public PeriodicReportContainsRestrictedFieldException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected PeriodicReportContainsRestrictedFieldException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/RecordDoesNotExistInTableException.cs b/Intuit.QuickBase.Core/Exceptions/RecordDoesNotExistInTableException.cs
index 0ebccad..f054d32 100644
--- a/Intuit.QuickBase.Core/Exceptions/RecordDoesNotExistInTableException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/RecordDoesNotExistInTableException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class RecordDoesNotExistInTableException : Exception
     {
-        public RecordDoesNotExistInTableException() { }
+        public RecordDoesNotExistInTableException() : base() { }
 
-        public RecordDoesNotExistInTableException(string message)
-        {
-            Message = message;
-        }
+        public RecordDoesNotExistInTableException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public RecordDoesNotExistInTableException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected RecordDoesNotExistInTableException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/RequiredFieldsMissingFromImportException.cs b/Intuit.QuickBase.Core/Exceptions/RequiredFieldsMissingFromImportException.cs
index 01115b7..275dc05 100644
--- a/Intuit.QuickBase.Core/Exceptions/RequiredFieldsMissingFromImportException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/RequiredFieldsMissingFromImportException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class RequiredFieldsMissingFromImportException : Exception
     {
-        public RequiredFieldsMissingFromImportException() { }
+        public RequiredFieldsMissingFromImportException() : base() { }
 
-        public RequiredFieldsMissingFromImportException(string message)
-        {
-            Message = message;
-        }
+        public RequiredFieldsMissingFromImportException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public RequiredFieldsMissingFromImportException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected RequiredFieldsMissingFromImportException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/SSLRequiredOnTableException.cs b/Intuit.QuickBase.Core/Exceptions/SSLRequiredOnTableException.cs
index 1d48d47..67826ef 100644
--- a/Intuit.QuickBase.Core/Exceptions/SSLRequiredOnTableException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/SSLRequiredOnTableException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class SslRequiredOnTableException : Exception
     {
-        public SslRequiredOnTableException() { }
+        public SslRequiredOnTableException() : base() { }
 
-        public SslRequiredOnTableException(string message)
-        {
-            Message = message;
-        }
+        public SslRequiredOnTableException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public SslRequiredOnTableException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected SslRequiredOnTableException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/SignInRequiredException.cs b/Intuit.QuickBase.Core/Exceptions/SignInRequiredException.cs
index 89e0832..2db5885 100644
--- a/Intuit.QuickBase.Core/Exceptions/SignInRequiredException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/SignInRequiredException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class SignInRequiredException : Exception
     {
-        public SignInRequiredException() { }
+        public SignInRequiredException() : base() { }
 
-        public SignInRequiredException(string message)
-        {
-            Message = message;
-        }
+        public SignInRequiredException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public SignInRequiredException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected SignInRequiredException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/SyntaxErrorException.cs b/Intuit.QuickBase.Core/Exceptions/SyntaxErrorException.cs
index b4d18f6..de8f0b7 100644
--- a/Intuit.QuickBase.Core/Exceptions/SyntaxErrorException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/SyntaxErrorException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class SyntaxErrorException : Exception
     {
-        public SyntaxErrorException() { }
+        public SyntaxErrorException() : base() { }
 
-        public SyntaxErrorException(string message)
-        {
-            Message = message;
-        }
+        public SyntaxErrorException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public SyntaxErrorException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected SyntaxErrorException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/TableDoesNotExistInQuickBase.cs b/Intuit.QuickBase.Core/Exceptions/TableDoesNotExistInQuickBase.cs
index fffb7c6..bda087c 100644
--- a/Intuit.QuickBase.Core/Exceptions/TableDoesNotExistInQuickBase.cs
+++ b/Intuit.QuickBase.Core/Exceptions/TableDoesNotExistInQuickBase.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class TableDoesNotExistInQuickBase : Exception
     {
-        public TableDoesNotExistInQuickBase() { }
+        public TableDoesNotExistInQuickBase() : base() { }
 
-        public TableDoesNotExistInQuickBase(string message)
-        {
-            Message = message;
-        }
+        public TableDoesNotExistInQuickBase(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public TableDoesNotExistInQuickBase(string message, Exception innerException) : base(message, innerException) { }
+
+        protected TableDoesNotExistInQuickBase(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/TechnicalDifficultiesException.cs b/Intuit.QuickBase.Core/Exceptions/TechnicalDifficultiesException.cs
index cd868c8..d403a83 100644
--- a/Intuit.QuickBase.Core/Exceptions/TechnicalDifficultiesException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/TechnicalDifficultiesException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class TechnicalDifficultiesException : Exception
     {
-        public TechnicalDifficultiesException() { }
+        public TechnicalDifficultiesException() : base() { }
 
-        public TechnicalDifficultiesException(string message)
-        {
-            Message = message;
-        }
+        public TechnicalDifficultiesException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public TechnicalDifficultiesException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected TechnicalDifficultiesException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/TooManyCriteriaInQueryException.cs b/Intuit.QuickBase.Core/Exceptions/TooManyCriteriaInQueryException.cs
index 40c45fb..7f772ea 100644
--- a/Intuit.QuickBase.Core/Exceptions/TooManyCriteriaInQueryException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/TooManyCriteriaInQueryException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class TooManyCriteriaInQueryException : Exception
     {
-        public TooManyCriteriaInQueryException() { }
+        public TooManyCriteriaInQueryException() : base() { }
 
-        public TooManyCriteriaInQueryException(string message)
-        {
-            Message = message;
-        }
+        public TooManyCriteriaInQueryException(string message) : base (message) { }
 
-        public new string Message { get; set; }
+        public TooManyCriteriaInQueryException(string message,  Exception inner) : base(message, inner) { }
+
+        protected TooManyCriteriaInQueryException(SerializationInfo serializationInfo, StreamingContext streamingContext) : base(serializationInfo, streamingContext) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/UnableToParseXMLException.cs b/Intuit.QuickBase.Core/Exceptions/UnableToParseXMLException.cs
index 161bc50..703ff2f 100644
--- a/Intuit.QuickBase.Core/Exceptions/UnableToParseXMLException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/UnableToParseXMLException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class UnableToParseXmlException : Exception
     {
-        public UnableToParseXmlException() { }
+        public UnableToParseXmlException() :base() { }
 
-        public UnableToParseXmlException(string message)
-        {
-            Message = message;
-        }
+        public UnableToParseXmlException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public UnableToParseXmlException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected UnableToParseXmlException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/UnimplementedOperationException.cs b/Intuit.QuickBase.Core/Exceptions/UnimplementedOperationException.cs
index 248465d..fad5c1b 100644
--- a/Intuit.QuickBase.Core/Exceptions/UnimplementedOperationException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/UnimplementedOperationException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class UnimplementedOperationException : Exception
     {
-        public UnimplementedOperationException() { }
+        public UnimplementedOperationException() : base() { }
 
-        public UnimplementedOperationException(string message)
-        {
-            Message = message;
-        }
+        public UnimplementedOperationException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public UnimplementedOperationException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected UnimplementedOperationException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/UnknownUserException.cs b/Intuit.QuickBase.Core/Exceptions/UnknownUserException.cs
index 1daaada..f13b0df 100644
--- a/Intuit.QuickBase.Core/Exceptions/UnknownUserException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/UnknownUserException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class UnknownUserException : Exception
     {
-        public UnknownUserException() { }
+        public UnknownUserException() : base() { }
 
-        public UnknownUserException(string message)
-        {
-            Message = message;
-        }
+        public UnknownUserException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public UnknownUserException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected UnknownUserException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/UnknownUsernamePasswordException.cs b/Intuit.QuickBase.Core/Exceptions/UnknownUsernamePasswordException.cs
index b1b6adf..f784c8d 100644
--- a/Intuit.QuickBase.Core/Exceptions/UnknownUsernamePasswordException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/UnknownUsernamePasswordException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class UnknownUsernamePasswordException : Exception
     {
-        public UnknownUsernamePasswordException() { }
+        public UnknownUsernamePasswordException() : base() { }
 
-        public UnknownUsernamePasswordException(string message)
-        {
-            Message = message;
-        }
+        public UnknownUsernamePasswordException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public UnknownUsernamePasswordException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected  UnknownUsernamePasswordException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/UpdateConflictDetectedException.cs b/Intuit.QuickBase.Core/Exceptions/UpdateConflictDetectedException.cs
index d6cacab..0c72d51 100644
--- a/Intuit.QuickBase.Core/Exceptions/UpdateConflictDetectedException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/UpdateConflictDetectedException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class UpdateConflictDetectedException : Exception
     {
-        public UpdateConflictDetectedException() { }
+        public UpdateConflictDetectedException() : base() { }
 
-        public UpdateConflictDetectedException(string message)
-        {
-            Message = message;
-        }
+        public UpdateConflictDetectedException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public UpdateConflictDetectedException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected UpdateConflictDetectedException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/UserAlreadyInRoleException.cs b/Intuit.QuickBase.Core/Exceptions/UserAlreadyInRoleException.cs
index 91227be..9333d7f 100644
--- a/Intuit.QuickBase.Core/Exceptions/UserAlreadyInRoleException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/UserAlreadyInRoleException.cs
@@ -6,20 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class UserAlreadyInRoleException : Exception
     {
-        public UserAlreadyInRoleException()
-        {
-        }
+        public UserAlreadyInRoleException() : base() { }
 
-        public UserAlreadyInRoleException(string message)
-        {
-            Message = message;
-        }
+        public UserAlreadyInRoleException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public UserAlreadyInRoleException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected UserAlreadyInRoleException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/UserExistsException.cs b/Intuit.QuickBase.Core/Exceptions/UserExistsException.cs
index 6043153..d15d824 100644
--- a/Intuit.QuickBase.Core/Exceptions/UserExistsException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/UserExistsException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class UserExistsException : Exception
     {
-        public UserExistsException() { }
+        public UserExistsException() : base() { }
 
-        public UserExistsException(string message)
-        {
-            Message = message;
-        }
+        public UserExistsException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public UserExistsException(string message, Exception innerException) : base(message, innerException) { }
+
+        protected UserExistsException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Exceptions/ViewTooLargeException.cs b/Intuit.QuickBase.Core/Exceptions/ViewTooLargeException.cs
index 6ffef1c..931b8d2 100644
--- a/Intuit.QuickBase.Core/Exceptions/ViewTooLargeException.cs
+++ b/Intuit.QuickBase.Core/Exceptions/ViewTooLargeException.cs
@@ -6,18 +6,19 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Serialization;
 
 namespace Intuit.QuickBase.Core.Exceptions
 {
+    [Serializable]
     public class ViewTooLargeException : Exception
     {
         public ViewTooLargeException() { }
 
-        public ViewTooLargeException(string message)
-        {
-            Message = message;
-        }
+        public ViewTooLargeException(string message) : base(message) { }
 
-        public new string Message { get; set; }
+        public ViewTooLargeException(string message,  Exception innerException) : base(message, innerException) { }
+
+        protected ViewTooLargeException(SerializationInfo serializationInfo, StreamingContext streamingContext) : base(serializationInfo, streamingContext) { }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Field.cs b/Intuit.QuickBase.Core/Field.cs
index ad32115..38a262a 100644
--- a/Intuit.QuickBase.Core/Field.cs
+++ b/Intuit.QuickBase.Core/Field.cs
@@ -50,7 +50,7 @@ public string Value
         {
             get
             {
-                return EncodeSpecialCharacters(_value);
+                return _value;
             }
             private set
             {
@@ -73,15 +73,5 @@ public string File
                 _file = value;
             }
         }
-
-        private static string EncodeSpecialCharacters(string strLine)
-        {
-            strLine = Regex.Replace(strLine, "&(?!amp;)", "&amp;");
-            strLine = Regex.Replace(strLine, "<", "&lt;");
-            strLine = Regex.Replace(strLine, ">", "&gt;");
-            strLine = Regex.Replace(strLine, "\"", "&quot;");
-            strLine = Regex.Replace(strLine, "'", "&apos;");
-            return strLine;
-        }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/FieldAddChoices.cs b/Intuit.QuickBase.Core/FieldAddChoices.cs
index 5ad7a78..f970eff 100644
--- a/Intuit.QuickBase.Core/FieldAddChoices.cs
+++ b/Intuit.QuickBase.Core/FieldAddChoices.cs
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System.Collections.Generic;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -18,21 +18,26 @@ public class FieldAddChoices : IQObject
         private readonly Payload.Payload _fieldAddChoicesPayload;
         private readonly IQUri _uri;
 
-        public FieldAddChoices(string ticket, string appToken, string accountDomain, string dbid, int fid, List<string> choices)
+        public FieldAddChoices(string ticket, string appToken, string accountDomain, string dbid, int fid, List<string> choices, string userToken = "")
         {
             _fieldAddChoicesPayload = new FieldChoicesPayload(fid, choices);
-            _fieldAddChoicesPayload = new ApplicationTicket(_fieldAddChoicesPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _fieldAddChoicesPayload = new ApplicationUserToken(_fieldAddChoicesPayload, userToken);
+            }
+            else
+            {
+                _fieldAddChoicesPayload = new ApplicationTicket(_fieldAddChoicesPayload, ticket);
+            }
             _fieldAddChoicesPayload = new ApplicationToken(_fieldAddChoicesPayload, appToken);
             _fieldAddChoicesPayload = new WrapPayload(_fieldAddChoicesPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _fieldAddChoicesPayload.GetXmlPayload();
-            }
+            _fieldAddChoicesPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -51,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/FieldRemoveChoices.cs b/Intuit.QuickBase.Core/FieldRemoveChoices.cs
index 7a0ab65..a5384d1 100644
--- a/Intuit.QuickBase.Core/FieldRemoveChoices.cs
+++ b/Intuit.QuickBase.Core/FieldRemoveChoices.cs
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System.Collections.Generic;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -18,21 +18,26 @@ public class FieldRemoveChoices : IQObject
         private readonly Payload.Payload _fieldAddChoicesPayload;
         private readonly IQUri _uri;
 
-        public FieldRemoveChoices(string ticket, string appToken, string accountDomain, string dbid, int fid, List<string> choices)
+        public FieldRemoveChoices(string ticket, string appToken, string accountDomain, string dbid, int fid, List<string> choices, string userToken = "")
         {
             _fieldAddChoicesPayload = new FieldChoicesPayload(fid, choices);
-            _fieldAddChoicesPayload = new ApplicationTicket(_fieldAddChoicesPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _fieldAddChoicesPayload = new ApplicationUserToken(_fieldAddChoicesPayload, userToken);
+            }
+            else
+            {
+                _fieldAddChoicesPayload = new ApplicationTicket(_fieldAddChoicesPayload, ticket);
+            }
             _fieldAddChoicesPayload = new ApplicationToken(_fieldAddChoicesPayload, appToken);
             _fieldAddChoicesPayload = new WrapPayload(_fieldAddChoicesPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _fieldAddChoicesPayload.GetXmlPayload();
-            }
+            _fieldAddChoicesPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -51,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/FieldType.cs b/Intuit.QuickBase.Core/FieldType.cs
index 5d3c176..35c80b2 100644
--- a/Intuit.QuickBase.Core/FieldType.cs
+++ b/Intuit.QuickBase.Core/FieldType.cs
@@ -43,11 +43,6 @@ public enum FieldType
         /// </summary>
         email,
 
-        /// <summary>
-        /// File Attachment
-        /// </summary>
-        file,
-
         /// <summary>
         /// Float
         /// </summary>
@@ -58,6 +53,11 @@ public enum FieldType
         /// </summary>
         currency,
 
+        /// <summary>
+        /// Percent
+        /// </summary>
+        percent,
+        
         /// <summary>
         /// Rating
         /// </summary>
@@ -73,6 +73,11 @@ public enum FieldType
         /// </summary>
         text,
 
+        /// <summary>
+        ///  DateTime
+        /// </summary>
+        timestamp,
+
         /// <summary>
         /// Time Of Day
         /// </summary>
@@ -83,13 +88,50 @@ public enum FieldType
         /// </summary>
         url,
 
-        // TODO: To be deleted.
-        timestamp,
-        recordid,
+        /// <summary>
+        /// UserID
+        /// </summary>
         userid,
-        percent,
+
+        /// <summary>
+        /// Multi User Field
+        /// </summary>
+        multiuserid,
+
+        /// <summary>
+        /// address
+        /// </summary>
+        address,
+
+        /// <summary>
+        /// Record ID
+        /// </summary>
+        recordid,
+
+        /// <summary>
+        /// Multi-Select Text
+        /// </summary>
+        multitext,
+
+        //TODO: not yet supported
+        /// <summary>
+        /// File Attachment
+        /// </summary>
+        file,
+
+        /// <summary>
+        /// ICalendar entry
+        /// </summary>
         icalendarbutton,
+
+        /// <summary>
+        /// VCard package
+        /// </summary>
         vcardbutton,
+
+        /// <summary>
+        /// Project predecessor
+        /// </summary>
         predecessor
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/FindDBByName.cs b/Intuit.QuickBase.Core/FindDBByName.cs
index bb2266f..659782f 100644
--- a/Intuit.QuickBase.Core/FindDBByName.cs
+++ b/Intuit.QuickBase.Core/FindDBByName.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -28,20 +29,26 @@ public class FindDbByName : IQObject
         /// <param name="ticket">Supply auth ticket for application access. See com.intuit.quickbase.API_Authenticate class to obtain a ticket.</param>
         /// <param name="accountDomain"></param>
         /// <param name="dbName">Supply application name to search for.</param>
-        public FindDbByName(string ticket, string accountDomain, string dbName)
+        /// <param name="userToken">option user token that can be used instead of ticket</param>
+        public FindDbByName(string ticket, string accountDomain, string dbName, string userToken = "")
         {
             _findDbByNamePayload = new FindDbByNamePayload(dbName);
-            _findDbByNamePayload = new ApplicationTicket(_findDbByNamePayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _findDbByNamePayload = new ApplicationUserToken(_findDbByNamePayload, userToken);
+            }
+            else
+            {
+                _findDbByNamePayload = new ApplicationTicket(_findDbByNamePayload, ticket);
+            }
             _findDbByNamePayload = new WrapPayload(_findDbByNamePayload);
             _uri = new QUriMain(accountDomain);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _findDbByNamePayload.GetXmlPayload();
-            }
+            _findDbByNamePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -60,7 +67,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GenResultsTable.cs b/Intuit.QuickBase.Core/GenResultsTable.cs
index a567ffa..7c9d4cf 100644
--- a/Intuit.QuickBase.Core/GenResultsTable.cs
+++ b/Intuit.QuickBase.Core/GenResultsTable.cs
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -21,13 +21,15 @@ public class GenResultsTable : IQObject
         public class Builder
         {
             internal string Ticket { get; set; }
+            internal string UserToken { get; set; }
             internal string AppToken { get; set; }
             internal string AccountDomain { get; set; }
             internal string Dbid { get; set; }
 
-            public Builder(string ticket, string appToken, string accountDomain, string dbid)
+            public Builder(string ticket, string appToken, string accountDomain, string dbid, string userToken = "")
             {
                 Ticket = ticket;
+                UserToken = userToken;
                 AppToken = appToken;
                 AccountDomain = accountDomain;
                 Dbid = dbid;
@@ -117,18 +119,23 @@ private GenResultsTable(Builder builder)
                 .SetFmt(builder.Fmt)
                 .SetOptions(builder.Options)
                 .Build();
-            _doQueryPayload = new ApplicationTicket(_doQueryPayload, builder.Ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (builder.UserToken.Length > 0)
+            {
+                _doQueryPayload = new ApplicationUserToken(_doQueryPayload, builder.UserToken);
+            }
+            else
+            {
+                _doQueryPayload = new ApplicationTicket(_doQueryPayload, builder.Ticket);
+            }
             _doQueryPayload = new ApplicationToken(_doQueryPayload, builder.AppToken);
             _doQueryPayload = new WrapPayload(_doQueryPayload);
             _uri = new QUriDbid(builder.AccountDomain, builder.Dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _doQueryPayload.GetXmlPayload();
-            }
+            _doQueryPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -147,7 +154,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostString();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GetAppDtmInfo.cs b/Intuit.QuickBase.Core/GetAppDtmInfo.cs
index 13a45ca..87253b7 100644
--- a/Intuit.QuickBase.Core/GetAppDtmInfo.cs
+++ b/Intuit.QuickBase.Core/GetAppDtmInfo.cs
@@ -7,7 +7,7 @@
  */
 using System;
 using System.Collections.Generic;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Uri;
 
 namespace Intuit.QuickBase.Core
@@ -52,7 +52,7 @@ public string Action
             }
         }
 
-        public XPathDocument Get()
+        public XElement Get()
         {
             return new Http().Get(this);
         }
diff --git a/Intuit.QuickBase.Core/GetDBInfo.cs b/Intuit.QuickBase.Core/GetDBInfo.cs
index 43a9895..2d8271c 100644
--- a/Intuit.QuickBase.Core/GetDBInfo.cs
+++ b/Intuit.QuickBase.Core/GetDBInfo.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -30,21 +31,27 @@ public class GetDbInfo : IQObject
         /// <param name="appToken">Supply application token that is assigned to your QuickBase Application. See QuickBase Online help to obtain an application token.</param>
         /// <param name="accountDomain"></param>
         /// <param name="dbid">Supply application-level or table-level dbid.</param>
-        public GetDbInfo(string ticket, string appToken, string accountDomain, string dbid)
+        /// <param name="userToken">option user token that can be used instead of a ticket</param>
+        public GetDbInfo(string ticket, string appToken, string accountDomain, string dbid, string userToken = "")
         {
             _getDbInfoPayload = new GetDbInfoPayload();
-            _getDbInfoPayload = new ApplicationTicket(_getDbInfoPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _getDbInfoPayload = new ApplicationUserToken(_getDbInfoPayload, userToken);
+            }
+            else
+            {
+                _getDbInfoPayload = new ApplicationTicket(_getDbInfoPayload, ticket);
+            }
             _getDbInfoPayload = new ApplicationToken(_getDbInfoPayload, appToken);
             _getDbInfoPayload = new WrapPayload(_getDbInfoPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _getDbInfoPayload.GetXmlPayload();
-            }
+            _getDbInfoPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -63,7 +70,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GetDBPage.cs b/Intuit.QuickBase.Core/GetDBPage.cs
index 76b929d..db0ab0d 100644
--- a/Intuit.QuickBase.Core/GetDBPage.cs
+++ b/Intuit.QuickBase.Core/GetDBPage.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,21 +18,26 @@ public class GetDBPage : IQObject
         private readonly Payload.Payload _getDbPagePayload;
         private readonly IQUri _uri;
 
-        public GetDBPage(string ticket, string appToken, string accountDomain, string dbid, int pageId)
+        public GetDBPage(string ticket, string appToken, string accountDomain, string dbid, int pageId, string userToken = "")
         {
             _getDbPagePayload = new GetDBPagePayload(pageId);
-            _getDbPagePayload = new ApplicationTicket(_getDbPagePayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _getDbPagePayload = new ApplicationUserToken(_getDbPagePayload, userToken);
+            }
+            else
+            {
+                _getDbPagePayload = new ApplicationTicket(_getDbPagePayload, ticket);
+            }
             _getDbPagePayload = new ApplicationToken(_getDbPagePayload, appToken);
             _getDbPagePayload = new WrapPayload(_getDbPagePayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _getDbPagePayload.GetXmlPayload();
-            }
+            _getDbPagePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -50,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GetDBvar.cs b/Intuit.QuickBase.Core/GetDBvar.cs
index f9623ac..7303d37 100644
--- a/Intuit.QuickBase.Core/GetDBvar.cs
+++ b/Intuit.QuickBase.Core/GetDBvar.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,21 +18,26 @@ public class GetDBvar : IQObject
         private readonly Payload.Payload _getDBvarPayload;
         private readonly IQUri _uri;
 
-        public GetDBvar(string ticket, string appToken, string accountDomain, string dbid, string varName)
+        public GetDBvar(string ticket, string appToken, string accountDomain, string dbid, string varName, string userToken = "")
         {
             _getDBvarPayload = new GetDBvarPayload(varName);
-            _getDBvarPayload = new ApplicationTicket(_getDBvarPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _getDBvarPayload = new ApplicationUserToken(_getDBvarPayload, userToken);
+            }
+            else
+            {
+                _getDBvarPayload = new ApplicationTicket(_getDBvarPayload, ticket);
+            }
             _getDBvarPayload = new ApplicationToken(_getDBvarPayload, appToken);
             _getDBvarPayload = new WrapPayload(_getDBvarPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _getDBvarPayload.GetXmlPayload();
-            }
+            _getDBvarPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -50,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GetNumRecords.cs b/Intuit.QuickBase.Core/GetNumRecords.cs
index 7272150..f2c7fb5 100644
--- a/Intuit.QuickBase.Core/GetNumRecords.cs
+++ b/Intuit.QuickBase.Core/GetNumRecords.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -28,21 +29,27 @@ public class GetNumRecords : IQObject
         /// <param name="appToken">Supply application token that is assigned to your QuickBase Application. See QuickBase Online help to obtain an application token.</param>
         /// <param name="accountDomain"></param>
         /// <param name="dbid">Supply table-level dbid.</param>
-        public GetNumRecords(string ticket, string appToken, string accountDomain, string dbid)
+        /// <param name="userToken">option user token the can be used instead of a ticket</param>
+        public GetNumRecords(string ticket, string appToken, string accountDomain, string dbid, string userToken = "")
         {
             _getNumRecordsPayload = new GetNumRecordsPayload();
-            _getNumRecordsPayload = new ApplicationTicket(_getNumRecordsPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _getNumRecordsPayload = new ApplicationUserToken(_getNumRecordsPayload, userToken);
+            }
+            else
+            {
+                _getNumRecordsPayload = new ApplicationTicket(_getNumRecordsPayload, ticket);
+            }
             _getNumRecordsPayload = new ApplicationToken(_getNumRecordsPayload, appToken);
             _getNumRecordsPayload = new WrapPayload(_getNumRecordsPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _getNumRecordsPayload.GetXmlPayload();
-            }
+            _getNumRecordsPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -61,7 +68,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GetRecordAsHTML.cs b/Intuit.QuickBase.Core/GetRecordAsHTML.cs
index 6275eec..08a7f7d 100644
--- a/Intuit.QuickBase.Core/GetRecordAsHTML.cs
+++ b/Intuit.QuickBase.Core/GetRecordAsHTML.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,30 +18,35 @@ public class GetRecordAsHtml : IQObject
         private Payload.Payload _getRecordAsHtmlPayload;
         private IQUri _uri;
 
-        public GetRecordAsHtml(string ticket, string appToken, string accountDomain, string dbid, int rid, bool jht)
+        public GetRecordAsHtml(string ticket, string appToken, string accountDomain, string dbid, int rid, bool jht, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new GetRecordAsHtmlPayload(rid, jht));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new GetRecordAsHtmlPayload(rid, jht), userToken);
         }
 
-        public GetRecordAsHtml(string ticket, string appToken, string accountDomain, string dbid, int rid)
+        public GetRecordAsHtml(string ticket, string appToken, string accountDomain, string dbid, int rid, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new GetRecordAsHtmlPayload(rid));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new GetRecordAsHtmlPayload(rid), userToken);
         }
 
-        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload)
+        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload, string userToken = "")
         {
-            _getRecordAsHtmlPayload = new ApplicationTicket(payload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _getRecordAsHtmlPayload = new ApplicationUserToken(payload, userToken);
+            }
+            else
+            {
+                _getRecordAsHtmlPayload = new ApplicationTicket(payload, ticket);
+            }
             _getRecordAsHtmlPayload = new ApplicationToken(_getRecordAsHtmlPayload, appToken);
             _getRecordAsHtmlPayload = new WrapPayload(_getRecordAsHtmlPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _getRecordAsHtmlPayload.GetXmlPayload();
-            }
+            _getRecordAsHtmlPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -59,7 +65,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GetRecordInfo.cs b/Intuit.QuickBase.Core/GetRecordInfo.cs
index 7cf528f..a5c849b 100644
--- a/Intuit.QuickBase.Core/GetRecordInfo.cs
+++ b/Intuit.QuickBase.Core/GetRecordInfo.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -30,21 +31,27 @@ public class GetRecordInfo : IQObject
         /// <param name="accountDomain"></param>
         /// <param name="dbid">Supply table-level dbid.</param>
         /// <param name="rid">Supply a record object.</param>
-        public GetRecordInfo(string ticket, string appToken, string accountDomain, string dbid, int rid)
+        /// <param name="userToken">option user token that can be used instead of a ticket</param>
+        public GetRecordInfo(string ticket, string appToken, string accountDomain, string dbid, int rid, string userToken = "")
         {
             _getRecordInfoPayload = new GetRecordInfoPayload(rid);
-            _getRecordInfoPayload = new ApplicationTicket(_getRecordInfoPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _getRecordInfoPayload = new ApplicationUserToken(_getRecordInfoPayload, userToken);
+            }
+            else
+            {
+                _getRecordInfoPayload = new ApplicationTicket(_getRecordInfoPayload, ticket);
+            }
             _getRecordInfoPayload = new ApplicationToken(_getRecordInfoPayload, appToken);
             _getRecordInfoPayload = new WrapPayload(_getRecordInfoPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _getRecordInfoPayload.GetXmlPayload();
-            }
+            _getRecordInfoPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -63,7 +70,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GetRoleInfo.cs b/Intuit.QuickBase.Core/GetRoleInfo.cs
index 29615b5..5ebc792 100644
--- a/Intuit.QuickBase.Core/GetRoleInfo.cs
+++ b/Intuit.QuickBase.Core/GetRoleInfo.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,21 +18,26 @@ public class GetRoleInfo : IQObject
         private readonly Payload.Payload _getRoleInfoPayload;
         private readonly IQUri _uri;
 
-        public GetRoleInfo(string ticket, string appToken, string accountDomain, string dbid)
+        public GetRoleInfo(string ticket, string appToken, string accountDomain, string dbid, string userToken = "")
         {
             _getRoleInfoPayload = new GetRoleInfoPayload();
-            _getRoleInfoPayload = new ApplicationTicket(_getRoleInfoPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _getRoleInfoPayload = new ApplicationUserToken(_getRoleInfoPayload, userToken);
+            }
+            else
+            {
+                _getRoleInfoPayload = new ApplicationTicket(_getRoleInfoPayload, ticket);
+            }
             _getRoleInfoPayload = new ApplicationToken(_getRoleInfoPayload, appToken);
             _getRoleInfoPayload = new WrapPayload(_getRoleInfoPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _getRoleInfoPayload.GetXmlPayload();
-            }
+            _getRoleInfoPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -50,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GetSchema.cs b/Intuit.QuickBase.Core/GetSchema.cs
index 9b7c321..cdc0d43 100644
--- a/Intuit.QuickBase.Core/GetSchema.cs
+++ b/Intuit.QuickBase.Core/GetSchema.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -30,21 +31,27 @@ public class GetSchema : IQObject
         /// <param name="appToken">Supply application token that is assigned to your QuickBase Application. See QuickBase Online help to obtain an application token.</param>
         /// <param name="accountDomain"></param>
         /// <param name="dbid">Supply application-level or table-level dbid.</param>
-        public GetSchema(string ticket, string appToken, string accountDomain, string dbid)
+        /// <param name="userToken">optional user token that can be used instead of a ticket</param>
+        public GetSchema(string ticket, string appToken, string accountDomain, string dbid, string userToken = "")
         {
             _getRecordInfoPayload = new GetSchemaPayload();
-            _getRecordInfoPayload = new ApplicationTicket(_getRecordInfoPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _getRecordInfoPayload = new ApplicationUserToken(_getRecordInfoPayload, userToken);
+            }
+            else
+            {
+                _getRecordInfoPayload = new ApplicationTicket(_getRecordInfoPayload, ticket);
+            }
             _getRecordInfoPayload = new ApplicationToken(_getRecordInfoPayload, appToken);
             _getRecordInfoPayload = new WrapPayload(_getRecordInfoPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _getRecordInfoPayload.GetXmlPayload();
-            }
+            _getRecordInfoPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -63,7 +70,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GetUserInfo.cs b/Intuit.QuickBase.Core/GetUserInfo.cs
index f2e6dac..91c93e6 100644
--- a/Intuit.QuickBase.Core/GetUserInfo.cs
+++ b/Intuit.QuickBase.Core/GetUserInfo.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,30 +18,35 @@ public class GetUserInfo : IQObject
         private Payload.Payload _getUserInfoPayload;
         private IQUri _uri;
 
-        public GetUserInfo(string ticket, string appToken, string accountDomain, string email)
+        public GetUserInfo(string ticket, string appToken, string accountDomain, string email, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, new GetUserInfoPayload(email));
+            CommonConstruction(ticket, appToken, accountDomain, new GetUserInfoPayload(email), userToken);
         }
 
-        public GetUserInfo(string ticket, string appToken, string accountDomain)
+        public GetUserInfo(string ticket, string appToken, string accountDomain, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, new GetUserInfoPayload());
+            CommonConstruction(ticket, appToken, accountDomain, new GetUserInfoPayload(), userToken);
         }
 
-        private void CommonConstruction(string ticket, string appToken, string accountDomain, Payload.Payload payload)
+        private void CommonConstruction(string ticket, string appToken, string accountDomain, Payload.Payload payload, string userToken = "")
         {
-            _getUserInfoPayload = new ApplicationTicket(payload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _getUserInfoPayload = new ApplicationUserToken(payload, userToken);
+            }
+            else
+            {
+                _getUserInfoPayload = new ApplicationTicket(payload, ticket);
+            }
             _getUserInfoPayload = new ApplicationToken(_getUserInfoPayload, appToken);
             _getUserInfoPayload = new WrapPayload(_getUserInfoPayload);
             _uri = new QUriMain(accountDomain);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _getUserInfoPayload.GetXmlPayload();
-            }
+            _getUserInfoPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -59,7 +65,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GetUserRole.cs b/Intuit.QuickBase.Core/GetUserRole.cs
index 233eff6..ee3fdcf 100644
--- a/Intuit.QuickBase.Core/GetUserRole.cs
+++ b/Intuit.QuickBase.Core/GetUserRole.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,21 +18,26 @@ public class GetUserRole : IQObject
         private readonly Payload.Payload _getUserRolePayload;
         private readonly IQUri _uri;
 
-        public GetUserRole(string ticket, string appToken, string accountDomain, string dbid, string userId)
+        public GetUserRole(string ticket, string appToken, string accountDomain, string dbid, string userId, string userToken = "")
         {
             _getUserRolePayload = new GetUserRolePayload(userId);
-            _getUserRolePayload = new ApplicationTicket(_getUserRolePayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _getUserRolePayload = new ApplicationUserToken(_getUserRolePayload, userToken);
+            }
+            else
+            {
+                _getUserRolePayload = new ApplicationTicket(_getUserRolePayload, ticket);
+            }
             _getUserRolePayload = new ApplicationToken(_getUserRolePayload, appToken);
             _getUserRolePayload = new WrapPayload(_getUserRolePayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _getUserRolePayload.GetXmlPayload();
-            }
+            _getUserRolePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -50,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/GrantedDBs.cs b/Intuit.QuickBase.Core/GrantedDBs.cs
index 98abbc2..0e9b988 100644
--- a/Intuit.QuickBase.Core/GrantedDBs.cs
+++ b/Intuit.QuickBase.Core/GrantedDBs.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -20,12 +21,14 @@ public class GrantedDBs : IQObject
         public class Builder
         {
             internal string Ticket { get; set; }
+            internal string UserToken { get; set; }
             internal string AppToken { get; set; }
             internal string AccountDomain { get; set; }
 
-            public Builder(string ticket, string appToken, string accountDomain)
+            public Builder(string ticket, string appToken, string accountDomain, string userToken = "")
             {
                 Ticket = ticket;
+                UserToken = userToken;
                 AppToken = appToken;
                 AccountDomain = accountDomain;
             }
@@ -67,18 +70,23 @@ private GrantedDBs(Builder builder)
                 .SetWithEmbeddedTables(builder.WithEmbeddedTables)
                 .SetAdminOnly(builder.AdminOnly)
                 .Build();
-            _grantDBsPayload = new ApplicationTicket(_grantDBsPayload, builder.Ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (builder.UserToken.Length > 0)
+            {
+                _grantDBsPayload = new ApplicationUserToken(_grantDBsPayload, builder.UserToken);
+            }
+            else
+            {
+                _grantDBsPayload = new ApplicationTicket(_grantDBsPayload, builder.Ticket);
+            }
             _grantDBsPayload = new ApplicationToken(_grantDBsPayload, builder.AppToken);
             _grantDBsPayload = new WrapPayload(_grantDBsPayload);
             _uri = new QUriMain(builder.AccountDomain);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _grantDBsPayload.GetXmlPayload();
-            }
+            _grantDBsPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -97,7 +105,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/Http.cs b/Intuit.QuickBase.Core/Http.cs
index 977e312..c447cba 100644
--- a/Intuit.QuickBase.Core/Http.cs
+++ b/Intuit.QuickBase.Core/Http.cs
@@ -7,18 +7,18 @@
  */
 using System.Net;
 using System.IO;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Exceptions;
 
 namespace Intuit.QuickBase.Core
 {
-    internal class Http
+    public class Http
     {
-        internal XPathDocument Get(IQGetObject apiAction)
+        internal XElement Get(IQGetObject apiAction)
         {
             WebResponse response = null;
             Stream responseStream = null;
-            XPathDocument xml;
+            XElement xml;
 
             try
             {
@@ -30,14 +30,13 @@ internal XPathDocument Get(IQGetObject apiAction)
 
                 response = request.GetResponse();
                 responseStream = response.GetResponseStream();
-                xml = new XPathDocument(responseStream);
+                xml = XElement.Load(responseStream);
             }
             finally
             {
                 if (responseStream != null) responseStream.Close();
                 if (response != null) response.Close();
             }
-
             CheckForException(xml);
             return xml;
         }
@@ -47,8 +46,7 @@ internal void GetFile(DownloadFile downloadFile)
             BinaryReader br = null;
             BinaryWriter bw = null;
             WebResponse response = null;
-            Stream responseStream = null;
-            
+
             try
             {
                 // Request
@@ -63,7 +61,7 @@ internal void GetFile(DownloadFile downloadFile)
 
                 // Response
                 response = request.GetResponse();
-                responseStream = response.GetResponseStream();
+                var responseStream = response.GetResponseStream();
 
                 // Write file
                 if (!Directory.Exists(downloadFile.Path))
@@ -79,17 +77,20 @@ internal void GetFile(DownloadFile downloadFile)
             {
                 if (bw != null) bw.Close();
                 if (br != null) br.Close();
-                if (responseStream != null) responseStream.Close();
                 if (response != null) response.Close();
             }
         }
 
-        internal static void CheckForException(XPathDocument xml)
+        public static void CheckForException(XElement xmlNav)
         {
-            var xmlNav = xml.CreateNavigator();
-            var errorcode = xmlNav.SelectSingleNode("/qdbapi/errcode").Value;
-            var errortext = xmlNav.SelectSingleNode("/qdbapi/errtext").Value;
-
+            string errorcode = xmlNav.Element("errcode").Value;
+            string errortext = xmlNav.Element("errtext").Value;
+            var errDetailNode = xmlNav.Element("errdetail");
+            if (errDetailNode != null)
+            {
+                string errdetail = errDetailNode.Value;
+                if (errdetail.Length > 0) errortext += ":" + errdetail;
+            }
             if ("2".Equals(errorcode))
             {
                 throw new InvalidInputException(errortext);
@@ -277,7 +278,8 @@ internal static void CheckForException(XPathDocument xml)
 
             if ("77".Equals(errorcode))
             {
-                throw new ApiRequestLimitExceededException(errortext);
+                System.DateTime waitUntil = System.DateTime.Now.AddSeconds(5); //I can't find any examples of where the 'wait time' is supposedly included in the error message, so just putting in a 5 sec wait time
+                throw new ApiRequestLimitExceededException(errortext, waitUntil);
             }
 
             if ("80".Equals(errorcode))
diff --git a/Intuit.QuickBase.Core/HttpPost.cs b/Intuit.QuickBase.Core/HttpPost.cs
index 3643c4c..8e5608c 100644
--- a/Intuit.QuickBase.Core/HttpPost.cs
+++ b/Intuit.QuickBase.Core/HttpPost.cs
@@ -5,13 +5,13 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core
 {
     internal abstract class HttpPost
     {
         internal abstract void Post(IQObject qObject);
-        internal abstract XPathDocument Response { get; set; }
+        internal abstract XElement Response { get; set; }
     }
 }
diff --git a/Intuit.QuickBase.Core/HttpPostString.cs b/Intuit.QuickBase.Core/HttpPostString.cs
index a49918f..bb0ab61 100644
--- a/Intuit.QuickBase.Core/HttpPostString.cs
+++ b/Intuit.QuickBase.Core/HttpPostString.cs
@@ -9,7 +9,7 @@
 using System.IO;
 using System.Net;
 using System.Text;
-using System.Xml.XPath;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core
 {
@@ -21,7 +21,9 @@ internal class HttpPostString : HttpPost
 
         internal override void Post(IQObject apiAction)
         {
-            var bytes = Encoding.UTF8.GetBytes(apiAction.XmlPayload);
+            XElement parent = new XElement("qdbapi");
+            apiAction.BuildXmlPayload(ref parent);
+            var bytes = Encoding.UTF8.GetBytes(parent.ToString());
             Stream requestStream = null;
             WebResponse webResponse = null;
             Stream responseStream = null;
@@ -51,10 +53,9 @@ internal override void Post(IQObject apiAction)
                 if (responseStream != null) responseStream.Close();
                 if (webResponse != null) webResponse.Close();
             }
-            var xml = new StringReader(String.Format("<?xml version=\"1.0\"?><response_data><![CDATA[{0}]]></response_data>", text));
-            Response = new XPathDocument(xml);
+            Response = XElement.Parse("<?xml version=\"1.0\"?><response_data><![CDATA[" + text + "]]></response_data>");
         }
 
-        internal override XPathDocument Response { get; set; }
+        internal override XElement Response { get; set; }
     }
 }
diff --git a/Intuit.QuickBase.Core/HttpPostXml.cs b/Intuit.QuickBase.Core/HttpPostXml.cs
index 02df1ac..287e01b 100644
--- a/Intuit.QuickBase.Core/HttpPostXml.cs
+++ b/Intuit.QuickBase.Core/HttpPostXml.cs
@@ -8,6 +8,7 @@
 using System.IO;
 using System.Net;
 using System.Text;
+using System.Xml.Linq;
 using System.Xml.XPath;
 
 namespace Intuit.QuickBase.Core
@@ -20,17 +21,20 @@ internal class HttpPostXml : HttpPost
 
         internal override void Post(IQObject qObject)
         {
-            var bytes = Encoding.UTF8.GetBytes(qObject.XmlPayload);
+            XElement parent = new XElement("qdbapi"); ;
+            qObject.BuildXmlPayload(ref parent);
+            var bytes = Encoding.UTF8.GetBytes(parent.ToString());
+            //File.AppendAllText(@"C:\Temp\QBDebugLog.txt", "**Sent->>" + qObject.Uri + " " + QUICKBASE_HEADER + qObject.Action + "\r\n" + parent + "\r\n");
             Stream requestStream = null;
             WebResponse webResponse = null;
             Stream responseStream = null;
-            XPathDocument xml;
+            XElement xml;
 
             try
             {
                 var request = (HttpWebRequest)WebRequest.Create(qObject.Uri);
                 request.Method = METHOD;
-                request.ProtocolVersion = HttpVersion.Version10;
+                request.ProtocolVersion = HttpVersion.Version11;
                 request.ContentType = CONTENT_TYPE;
                 request.ContentLength = bytes.Length;
                 request.KeepAlive = false;
@@ -42,19 +46,20 @@ internal override void Post(IQObject qObject)
 
                 webResponse = request.GetResponse();
                 responseStream = webResponse.GetResponseStream();
-                xml = new XPathDocument(responseStream);
+                xml = XElement.Load(responseStream, LoadOptions.PreserveWhitespace);
+                //File.AppendAllText(@"C:\Temp\QBDebugLog.txt", "**Received-<<\r\n" + xml.CreateNavigator().InnerXml + "\r\n");
             }
             finally
             {
-                if (requestStream != null) requestStream.Close();
-                if (responseStream != null) responseStream.Close();
-                if (webResponse != null) webResponse.Close();
+                requestStream?.Close();
+                responseStream?.Close();
+                webResponse?.Close();
             }
         
             Http.CheckForException(xml);
             Response = xml;
         }
 
-        internal override XPathDocument Response { get; set; }
+        internal override XElement Response { get; set; }
     }
 }
diff --git a/Intuit.QuickBase.Core/IQGetObject.cs b/Intuit.QuickBase.Core/IQGetObject.cs
index a28539a..eb195e9 100644
--- a/Intuit.QuickBase.Core/IQGetObject.cs
+++ b/Intuit.QuickBase.Core/IQGetObject.cs
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core
 {
@@ -14,6 +14,6 @@ public interface IQGetObject
         void AddParameter(string name, string value);
         System.Uri Uri { get; }
         string Action { get; }
-        XPathDocument Get();
+        XElement Get();
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/IQObject.cs b/Intuit.QuickBase.Core/IQObject.cs
index 74ca3a8..161a111 100644
--- a/Intuit.QuickBase.Core/IQObject.cs
+++ b/Intuit.QuickBase.Core/IQObject.cs
@@ -5,15 +5,16 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core
 {
     public interface IQObject
     {
-        string XmlPayload { get; }
+        void BuildXmlPayload(ref XElement parent);
         System.Uri Uri { get; }
         string Action { get; }
-        XPathDocument Post();
+        XElement Post();
     }
 }
diff --git a/Intuit.QuickBase.Core/ImportFromCSV.cs b/Intuit.QuickBase.Core/ImportFromCSV.cs
index d499554..6fe0e84 100644
--- a/Intuit.QuickBase.Core/ImportFromCSV.cs
+++ b/Intuit.QuickBase.Core/ImportFromCSV.cs
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -23,6 +23,7 @@ public class Builder
             private string _recordsCsv;
 
             internal string Ticket { get; set; }
+            internal string UserToken { get; set; }
             internal string AppToken { get; set; }
             internal string AccountDomain { get; set; }
             internal string Dbid { get; set; }
@@ -40,9 +41,10 @@ internal string RecordsCsv
                 }
             }
 
-            public Builder(string ticket, string appToken, string accountDomain, string dbid, string recordsCsv)
+            public Builder(string ticket, string appToken, string accountDomain, string dbid, string recordsCsv, string userToken = "")
             {
                 Ticket = ticket;
+                UserToken = userToken;
                 AppToken = appToken;
                 AccountDomain = accountDomain;
                 Dbid = dbid;
@@ -67,6 +69,14 @@ public Builder SetSkipFirst(bool val)
                 return this;
             }
 
+            internal bool TimeInUtc { get; private set; }
+
+            public Builder SetTimeInUtc(bool val)
+            {
+                TimeInUtc = val;
+                return this;
+            }
+
             public ImportFromCSV Build()
             {
                 return new ImportFromCSV(this);
@@ -78,19 +88,25 @@ private ImportFromCSV(Builder builder)
             _importFromCSVPayload = new ImportFromCSVPayload.Builder(builder.RecordsCsv)
                 .SetCList(builder.CList)
                 .SetSkipFirst(builder.SkipFirst)
+                .SetTimeInUtc(builder.TimeInUtc)
                 .Build();
-            _importFromCSVPayload = new ApplicationTicket(_importFromCSVPayload, builder.Ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (builder.UserToken.Length > 0)
+            {
+                _importFromCSVPayload = new ApplicationUserToken(_importFromCSVPayload, builder.UserToken);
+            }
+            else
+            {
+                _importFromCSVPayload = new ApplicationTicket(_importFromCSVPayload, builder.Ticket);
+            }
             _importFromCSVPayload = new ApplicationToken(_importFromCSVPayload, builder.AppToken);
             _importFromCSVPayload = new WrapPayload(_importFromCSVPayload);
             _uri = new QUriDbid(builder.AccountDomain, builder.Dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _importFromCSVPayload.GetXmlPayload();
-            }
+            _importFromCSVPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -109,7 +125,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/Intuit.QuickBase.Core.csproj b/Intuit.QuickBase.Core/Intuit.QuickBase.Core.csproj
index f96db7d..d68cad6 100644
--- a/Intuit.QuickBase.Core/Intuit.QuickBase.Core.csproj
+++ b/Intuit.QuickBase.Core/Intuit.QuickBase.Core.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,12 +11,21 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Intuit.QuickBase.Core</RootNamespace>
     <AssemblyName>Intuit.QuickBase.Core</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -25,6 +35,9 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +46,9 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>
+    </CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -151,6 +167,7 @@
     <Compile Include="Payload\AddUserToRolePayload.cs" />
     <Compile Include="Payload\ApplicationTicket.cs" />
     <Compile Include="Payload\ApplicationToken.cs" />
+    <Compile Include="Payload\ApplicationUserToken.cs" />
     <Compile Include="Payload\AuthenticatePayload.cs" />
     <Compile Include="Payload\ChangeRecordOwnerPayload.cs" />
     <Compile Include="Payload\ChangeUserRolePayload.cs" />
@@ -204,7 +221,22 @@
     <Compile Include="Uri\QUriMain.cs" />
     <Compile Include="UserRoles.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Intuit.QuickBase.Core/Payload/AddFieldPayload.cs b/Intuit.QuickBase.Core/Payload/AddFieldPayload.cs
index 8eb6a08..59954d1 100644
--- a/Intuit.QuickBase.Core/Payload/AddFieldPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/AddFieldPayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -41,12 +42,11 @@ private string Label
 
         private Mode Mode { get; set; }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(String.Format("<label>{0}</label><type>{1}</type>", Label, Type));
-            sb.Append(Mode != Mode.none ? String.Format("<mode>{0}</mode>", Mode) : String.Empty);
-            return sb.ToString();
+            parent.Add(new XElement("label", Label));
+            parent.Add(new XElement("type", Type));
+            if (Mode != Mode.none) parent.Add(new XElement("mode", Mode));
         }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Payload/AddRecordPayload.cs b/Intuit.QuickBase.Core/Payload/AddRecordPayload.cs
index 38c1760..74997f2 100644
--- a/Intuit.QuickBase.Core/Payload/AddRecordPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/AddRecordPayload.cs
@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -16,6 +17,7 @@ internal class AddRecordPayload : Payload
     {
         private readonly List<IField> _fields;
         private readonly bool _disprec;
+        private readonly bool _timeInUtc;
         private readonly bool _fform;
 
         internal class Builder
@@ -34,6 +36,13 @@ internal Builder SetDisprec(bool val)
                 return this;
             }
 
+            internal bool TimeInUtc { get; private set; }
+            internal Builder SetTimeInUtc(bool val)
+            {
+                TimeInUtc = val;
+                return this;
+            }
+
             internal bool Fform { get; private set; }
             internal Builder SetFform(bool val)
             {
@@ -51,30 +60,31 @@ private AddRecordPayload(Builder builder)
         {
             _fields = builder.Fields;
             _disprec = builder.Disprec;
+            _timeInUtc = builder.TimeInUtc;
             _fform = builder.Fform;
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
             foreach (var field in _fields)
             {
                 if (field.Type == FieldType.file)
                 {
-                    sb.Append(String.Format(
-                        "<field fid=\"{0}\" filename=\"{1}\">{2}</field>",
-                        field.Fid, field.Value, EncodeFile(field.File)));
+                    XElement xelm = new XElement("field", EncodeFile(field.File));
+                    xelm.SetAttributeValue("fid", field.Fid);
+                    xelm.SetAttributeValue("filename", field.Value);
+                    parent.Add(xelm);
                 }
                 else
                 {
-                    sb.Append(String.Format(
-                        "<field fid=\"{0}\">{1}</field>",
-                        field.Fid, field.Value));
+                    XElement xelm = new XElement("field", field.Value);
+                    xelm.SetAttributeValue("fid", field.Fid);
+                    parent.Add(xelm);
                 }
             }
-            sb.Append(_disprec ? "<disprec/>" : String.Empty);
-            sb.Append(_fform ? "<fform/>" : String.Empty);
-            return sb.ToString();
+            if (_disprec) parent.Add(new XElement("disprec"));
+            if (_timeInUtc) parent.Add(new XElement("msInUTC", 1));
+            if (_fform) parent.Add(new XElement("fform"));
         }
 
         private static string EncodeFile(string file)
diff --git a/Intuit.QuickBase.Core/Payload/AddReplaceDBPagePayload.cs b/Intuit.QuickBase.Core/Payload/AddReplaceDBPagePayload.cs
index f61b0e1..4dcae57 100644
--- a/Intuit.QuickBase.Core/Payload/AddReplaceDBPagePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/AddReplaceDBPagePayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -68,14 +69,12 @@ private string PageBody
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(PageId > 0 ? String.Format("<pageid>{0}</pageid>", PageId) : String.Empty);
-            sb.Append(!String.IsNullOrEmpty(PageName) ? String.Format("<pagename>{0}</pagename>", PageName) : String.Empty);
-            sb.Append(String.Format("<pagetype>{0}</pagetype>", (int)PageType));
-            sb.Append(String.Format("<pagebody>{0}</pagebody>", PageBody));
-            return sb.ToString();
+            if (PageId > 0) parent.Add(new XElement("pageid", PageId));
+            if (!string.IsNullOrEmpty(PageName)) parent.Add(new XElement("pagename", PageName));
+            parent.Add(new XElement("pagetype", (int)PageType));
+            parent.Add(new XElement("pagebody", PageBody));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/AddUserToRolePayload.cs b/Intuit.QuickBase.Core/Payload/AddUserToRolePayload.cs
index 1e54b26..2032baf 100644
--- a/Intuit.QuickBase.Core/Payload/AddUserToRolePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/AddUserToRolePayload.cs
@@ -6,6 +6,8 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -41,9 +43,10 @@ private int RoleId
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<userid>{0}</userid><roleid>{1}</roleid>", UserId, RoleId);
+            parent.Add(new XElement("userid", UserId));
+            parent.Add(new XElement("roleid", RoleId));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/ApplicationTicket.cs b/Intuit.QuickBase.Core/Payload/ApplicationTicket.cs
index 35b5a01..038e7dc 100644
--- a/Intuit.QuickBase.Core/Payload/ApplicationTicket.cs
+++ b/Intuit.QuickBase.Core/Payload/ApplicationTicket.cs
@@ -6,6 +6,8 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -30,9 +32,10 @@ private string Ticket
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("{0}<ticket>{1}</ticket>", Payload.GetXmlPayload(), Ticket);
+            Payload.GetXmlPayload(ref parent);
+            parent.Add(new XElement("ticket", Ticket));
         }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Payload/ApplicationToken.cs b/Intuit.QuickBase.Core/Payload/ApplicationToken.cs
index 2a449da..c8c6f47 100644
--- a/Intuit.QuickBase.Core/Payload/ApplicationToken.cs
+++ b/Intuit.QuickBase.Core/Payload/ApplicationToken.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -19,9 +20,10 @@ internal ApplicationToken(Payload payload, string token)
 
         private string Token { get; set; }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return !String.IsNullOrEmpty(Token) ? String.Format("{0}<apptoken>{1}</apptoken>", Payload.GetXmlPayload(), Token) : Payload.GetXmlPayload();
+            Payload.GetXmlPayload(ref parent);
+            if (!string.IsNullOrEmpty(Token)) parent.Add(new XElement("apptoken", Token));
         }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Payload/ApplicationUserToken.cs b/Intuit.QuickBase.Core/Payload/ApplicationUserToken.cs
new file mode 100644
index 0000000..4fbac9b
--- /dev/null
+++ b/Intuit.QuickBase.Core/Payload/ApplicationUserToken.cs
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2010 Intuit Inc. All rights reserved.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.opensource.org/licenses/eclipse-1.0.php
+ */
+using System;
+using System.Xml.Linq;
+
+namespace Intuit.QuickBase.Core.Payload
+{
+    internal class ApplicationUserToken : PayloadDecorator
+    {
+        internal ApplicationUserToken(Payload payload, string token)
+        {
+            Payload = payload;
+            Token = token;
+        }
+
+        private string Token { get; set; }
+
+        internal override void GetXmlPayload(ref XElement parent)
+        {
+            Payload.GetXmlPayload(ref parent);
+            if (!string.IsNullOrEmpty(Token)) parent.Add(new XElement("usertoken", Token));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Payload/AuthenticatePayload.cs b/Intuit.QuickBase.Core/Payload/AuthenticatePayload.cs
index f3b10a1..307d1e6 100644
--- a/Intuit.QuickBase.Core/Payload/AuthenticatePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/AuthenticatePayload.cs
@@ -7,6 +7,8 @@
  */
 using System;
 using System.Text;
+using System.Xml;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -60,13 +62,11 @@ private int Hours
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(String.Format("<username>{0}</username><password>{1}</password>",
-                Username, Password));
-            sb.Append(Hours > 0 ? String.Format("<hours>{0}</hours>", Hours) : String.Empty);
-            return sb.ToString();
+            parent.Add(new XElement("username", Username));
+            parent.Add(new XElement("password", Password));
+            if (Hours > 0) parent.Add(new XElement("hours", Hours));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/ChangeRecordOwnerPayload.cs b/Intuit.QuickBase.Core/Payload/ChangeRecordOwnerPayload.cs
index f1dcc60..cd73a71 100644
--- a/Intuit.QuickBase.Core/Payload/ChangeRecordOwnerPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/ChangeRecordOwnerPayload.cs
@@ -6,6 +6,8 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -41,9 +43,10 @@ private string NewOwner
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<rid>{0}</rid><newowner>{1}</newowner>", Rid, NewOwner);
+            parent.Add(new XElement("rid", Rid));
+            parent.Add(new XElement("newowner", NewOwner));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/ChangeUserRolePayload.cs b/Intuit.QuickBase.Core/Payload/ChangeUserRolePayload.cs
index df08d6d..5ad7e1f 100644
--- a/Intuit.QuickBase.Core/Payload/ChangeUserRolePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/ChangeUserRolePayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -60,12 +61,14 @@ private int NewRoleId
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(String.Format("<userid>{0}</userid><roleid>{1}</roleid>", UserId, RoleId));
-            sb.Append(NewRoleId > 0 ? String.Format("<newRoleid>{0}</newRoleid>", NewRoleId) : "<newRoleid/>");
-            return sb.ToString();
+            parent.Add(new XElement("userid", UserId));
+            parent.Add(new XElement("roleid", RoleId));
+            if (NewRoleId > 0)
+                parent.Add(new XElement("newRoleid", NewRoleId));
+            else
+                parent.Add(new XElement("newRoleid"));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/CloneDatabasePayload.cs b/Intuit.QuickBase.Core/Payload/CloneDatabasePayload.cs
index fd7bf76..232f4a6 100644
--- a/Intuit.QuickBase.Core/Payload/CloneDatabasePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/CloneDatabasePayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -56,13 +57,12 @@ private CloneDatabasePayload(Builder builder)
             _excludeFiles = builder.ExcludeFiles;
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var xmlData = new StringBuilder();
-            xmlData.Append(String.Format("<newdbname>{0}</newdbname><newdbdesc>{1}</newdbdesc>", _newDBName, _newDBDesc));
-            xmlData.Append(_keepData ? "<keepData>1</keepData>" : String.Empty);
-            xmlData.Append(_excludeFiles ? "<excludefiles>1</excludefiles>" : String.Empty);
-            return xmlData.ToString();
+            parent.Add(new XElement("newdbname", _newDBName));
+            parent.Add(new XElement("newdbdesc", _newDBDesc));
+            if (_keepData) parent.Add(new XElement("keepData", 1));
+            if (_excludeFiles) parent.Add(new XElement("excludefiles", 1));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/CreateDatabasePayload.cs b/Intuit.QuickBase.Core/Payload/CreateDatabasePayload.cs
index 6cc425c..34fa2a6 100644
--- a/Intuit.QuickBase.Core/Payload/CreateDatabasePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/CreateDatabasePayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -46,12 +47,11 @@ private string DBDesc
 
         private bool CreateAppToken { get; set; }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var xmlData = new StringBuilder();
-            xmlData.Append(String.Format("<dbname>{0}</dbname><dbdesc>{1}</dbdesc>", DbName, DBDesc));
-            xmlData.Append(CreateAppToken ? "<createapptoken>1</createapptoken>" : String.Empty);
-            return xmlData.ToString();
+            parent.Add(new XElement("dbname", DbName));
+            parent.Add(new XElement("dbdesc", DBDesc));
+            if (CreateAppToken) parent.Add(new XElement("createapptoken", 1));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/CreateTablePayload.cs b/Intuit.QuickBase.Core/Payload/CreateTablePayload.cs
index 3d75d09..7675400 100644
--- a/Intuit.QuickBase.Core/Payload/CreateTablePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/CreateTablePayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -43,12 +44,10 @@ internal CreateTablePayload(Builder builder)
             _pNoun = builder.PNoun;
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(!String.IsNullOrEmpty(_tName) ? String.Format("<tname>{0}</tname>", _tName) : String.Empty);
-            sb.Append(!String.IsNullOrEmpty(_pNoun) ? String.Format("<pnoun>{0}</pnoun>", _pNoun) : String.Empty);
-            return sb.ToString();
+            if (!string.IsNullOrEmpty(_tName)) parent.Add(new XElement("tname", _tName));
+            if (!string.IsNullOrEmpty(_pNoun)) parent.Add(new XElement("pnoun", _pNoun));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/DeleteDatabasePayload.cs b/Intuit.QuickBase.Core/Payload/DeleteDatabasePayload.cs
index 4234db5..58f8d2a 100644
--- a/Intuit.QuickBase.Core/Payload/DeleteDatabasePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/DeleteDatabasePayload.cs
@@ -6,14 +6,15 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
     internal class DeleteDatabasePayload : Payload
     {
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Empty;
+            //do nothing
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/DeleteFieldPayload.cs b/Intuit.QuickBase.Core/Payload/DeleteFieldPayload.cs
index 9925335..9132dee 100644
--- a/Intuit.QuickBase.Core/Payload/DeleteFieldPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/DeleteFieldPayload.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -28,9 +29,9 @@ private int Fid
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<fid>{0}</fid>", Fid);
+            parent.Add(new XElement("fid", Fid));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/DeleteRecordPayload.cs b/Intuit.QuickBase.Core/Payload/DeleteRecordPayload.cs
index a5c3e99..b7c217c 100644
--- a/Intuit.QuickBase.Core/Payload/DeleteRecordPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/DeleteRecordPayload.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -28,9 +29,9 @@ private int Rid
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<rid>{0}</rid>", Rid);
+            parent.Add(new XElement("rid", Rid));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/DoQueryCountPayload.cs b/Intuit.QuickBase.Core/Payload/DoQueryCountPayload.cs
index 47401d2..79a4e40 100644
--- a/Intuit.QuickBase.Core/Payload/DoQueryCountPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/DoQueryCountPayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -52,13 +53,11 @@ private DoQueryCountPayload(Builder builder)
             _qName = builder.QName;
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(!String.IsNullOrEmpty(_query) ? String.Format("<query>{0}</query>", _query) : String.Empty);
-            sb.Append(_qid > 0 ? String.Format("<qid>{0}</qid>", _qid) : String.Empty);
-            sb.Append(!String.IsNullOrEmpty(_qName) ? String.Format("<qname>{0}</qname>", _qName) : String.Empty);
-            return sb.ToString();
+            if (!string.IsNullOrEmpty(_query)) parent.Add(new XElement("query", _query));
+            if (_qid > 0) parent.Add(new XElement("qid", _qid));
+            if (!string.IsNullOrEmpty(_qName)) parent.Add(new XElement("qname", _qName));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/DoQueryPayload.cs b/Intuit.QuickBase.Core/Payload/DoQueryPayload.cs
index ea379d1..6eafe93 100644
--- a/Intuit.QuickBase.Core/Payload/DoQueryPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/DoQueryPayload.cs
@@ -6,7 +6,9 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Runtime.Remoting.Metadata.W3cXsd2001;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -17,7 +19,7 @@ internal class DoQueryPayload : Payload
         private readonly string _qName;
         private readonly string _cList;
         private readonly string _sList;
-        private readonly string _options;
+        private string _options;
         private readonly bool _fmt;
 
         internal class Builder
@@ -88,17 +90,21 @@ private DoQueryPayload(Builder builder)
             _fmt = builder.Fmt;
         }
 
-        internal override string GetXmlPayload()
+        public string Options
         {
-            var sb = new StringBuilder();
-            sb.Append(!String.IsNullOrEmpty(_query) ? String.Format("<query>{0}</query>", _query) : String.Empty);
-            sb.Append(_qid > 0 ? String.Format("<qid>{0}</qid>", _qid) : String.Empty);
-            sb.Append(!String.IsNullOrEmpty(_qName) ? String.Format("<qname>{0}</qname>", _qName) : String.Empty);
-            sb.Append(!String.IsNullOrEmpty(_cList) ? String.Format("<clist>{0}</clist>", _cList) : String.Empty);
-            sb.Append(!String.IsNullOrEmpty(_sList) ? String.Format("<slist>{0}</slist>", _sList) : String.Empty);
-            sb.Append(!String.IsNullOrEmpty(_options) ? String.Format("<options>{0}</options>", _options) : String.Empty);
-            sb.Append(_fmt ? "<fmt>structured</fmt>" : String.Empty);
-            return sb.ToString();
+            get { return _options; }
+            set { _options = value; }
+        }
+
+        internal override void GetXmlPayload(ref XElement parent)
+        {
+            if (!string.IsNullOrEmpty(_query)) parent.Add(new XElement("query", _query));
+            if (_qid > 0) parent.Add(new XElement("qid", _qid));
+            if (!string.IsNullOrEmpty(_qName)) parent.Add(new XElement("qname", _qName));
+            if (!string.IsNullOrEmpty(_cList)) parent.Add(new XElement("clist", _cList));
+            if (!string.IsNullOrEmpty(_sList)) parent.Add(new XElement("slist", _sList));
+            if (!string.IsNullOrEmpty(_options)) parent.Add(new XElement("options", _options));
+            parent.Add(new XElement("fmt", "structured"));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/EditRecordPayload.cs b/Intuit.QuickBase.Core/Payload/EditRecordPayload.cs
index ec2b29f..b4e489a 100644
--- a/Intuit.QuickBase.Core/Payload/EditRecordPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/EditRecordPayload.cs
@@ -8,7 +8,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -18,6 +20,7 @@ internal class EditRecordPayload : Payload
         private readonly string _updateId;
         private readonly List<IField> _fields;
         private readonly bool _disprec;
+        private readonly bool _timeInUtc;
         private readonly bool _fform;
 
         internal class Builder
@@ -45,6 +48,13 @@ internal Builder SetDisprec(bool val)
                 return this;
             }
 
+            internal bool TimeInUtc { get; private set; }
+            internal Builder SetTimeInUtc(bool val)
+            {
+                TimeInUtc = val;
+                return this;
+            }
+
             internal bool Fform { get; private set; }
             internal Builder SetFform(bool val)
             {
@@ -64,32 +74,33 @@ private EditRecordPayload(Builder builder)
             _updateId = builder.UpdateId;
             _fields = builder.Fields;
             _disprec = builder.Disprec;
+            _timeInUtc = builder.TimeInUtc;
             _fform = builder.Fform;
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(String.Format("<rid>{0}</rid>", _rid));
-            sb.Append(!String.IsNullOrEmpty(_updateId) ? String.Format("<update_id>{0}</update_id>", _updateId) : String.Empty);
+            parent.Add(new XElement("rid", _rid));
+            if (!string.IsNullOrEmpty(_updateId)) parent.Add(new XElement("update_id", _updateId));
             foreach (var field in _fields)
             {
                 if (field.Type == FieldType.file)
                 {
-                    sb.Append(String.Format(
-                        "<field fid=\"{0}\" filename=\"{1}\">{2}</field>",
-                        field.Fid, field.Value, EncodeFile(field.File)));
+                    XElement xelm = new XElement("field", EncodeFile(field.File));
+                    xelm.SetAttributeValue("fid", field.Fid);
+                    xelm.SetAttributeValue("filename", field.Value);
+                    parent.Add(xelm);
                 }
                 else
                 {
-                    sb.Append(String.Format(
-                        "<field fid=\"{0}\">{1}</field>",
-                        field.Fid, field.Value));
+                    XElement xelm = new XElement("field", field.Value);
+                    xelm.SetAttributeValue("fid", field.Fid);
+                    parent.Add(xelm);
                 }
             }
-            sb.Append(_disprec ? "<disprec/>" : String.Empty);
-            sb.Append(_fform ? "<fform/>" : String.Empty);
-            return sb.ToString();
+            if (_disprec) parent.Add(new XElement("disprec"));
+            if (_timeInUtc) parent.Add(new XElement("msInUtc", 1));
+            if (_fform) parent.Add(new XElement("fform"));
         }
 
         private static string EncodeFile(string file)
diff --git a/Intuit.QuickBase.Core/Payload/FieldChoicesPayload.cs b/Intuit.QuickBase.Core/Payload/FieldChoicesPayload.cs
index 581cbf2..e5bb271 100644
--- a/Intuit.QuickBase.Core/Payload/FieldChoicesPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/FieldChoicesPayload.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -42,15 +43,13 @@ private List<string> Choices
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(String.Format("<fid>{0}</fid>", Fid));
+            parent.Add(new XElement("fid", Fid));
             foreach(var choice in Choices)
             {
-                sb.Append(String.Format("<choice>{0}</choice>", choice));
+                parent.Add(new XElement("choice", choice));
             }
-            return sb.ToString();
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/FindDbByNamePayload.cs b/Intuit.QuickBase.Core/Payload/FindDbByNamePayload.cs
index d1df795..336d70f 100644
--- a/Intuit.QuickBase.Core/Payload/FindDbByNamePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/FindDbByNamePayload.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -29,9 +30,9 @@ private string DbName
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<dbname>{0}</dbname>", DbName);
+            parent.Add(new XElement("dbname", DbName));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/GetDBPagePayload.cs b/Intuit.QuickBase.Core/Payload/GetDBPagePayload.cs
index f7bdcda..52d7335 100644
--- a/Intuit.QuickBase.Core/Payload/GetDBPagePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/GetDBPagePayload.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -28,9 +29,9 @@ private int PageId
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<pageID>{0}</pageID>", PageId);
+            parent.Add(new XElement("pageID", PageId));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/GetDBvarPayload.cs b/Intuit.QuickBase.Core/Payload/GetDBvarPayload.cs
index 7d4053c..f6bee75 100644
--- a/Intuit.QuickBase.Core/Payload/GetDBvarPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/GetDBvarPayload.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -29,9 +30,9 @@ private string VarName
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<varname>{0}</varname>", VarName);
+            parent.Add(new XElement("varname", VarName));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/GetDbInfoPayload.cs b/Intuit.QuickBase.Core/Payload/GetDbInfoPayload.cs
index 94b0dc2..2af61da 100644
--- a/Intuit.QuickBase.Core/Payload/GetDbInfoPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/GetDbInfoPayload.cs
@@ -6,14 +6,15 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
     internal class GetDbInfoPayload : Payload
     {
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Empty;
+            //do nothing
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/GetNumRecordsPayload.cs b/Intuit.QuickBase.Core/Payload/GetNumRecordsPayload.cs
index 6a71d91..163f646 100644
--- a/Intuit.QuickBase.Core/Payload/GetNumRecordsPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/GetNumRecordsPayload.cs
@@ -6,14 +6,15 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
     internal class GetNumRecordsPayload : Payload
     {
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Empty;
+            //do nothing
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/GetRecordAsHtmlPayload.cs b/Intuit.QuickBase.Core/Payload/GetRecordAsHtmlPayload.cs
index 7450064..6f22d56 100644
--- a/Intuit.QuickBase.Core/Payload/GetRecordAsHtmlPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/GetRecordAsHtmlPayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -37,12 +38,10 @@ private int Rid
 
         private bool Jht { get; set; }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(String.Format("<rid>{0}</rid>", Rid));
-            sb.Append(Jht ? "<jht>" + "1" + "</jht>" : String.Empty);
-            return sb.ToString();
+            parent.Add(new XElement("rid", Rid));
+            if (Jht) parent.Add(new XElement("jht", 1));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/GetRecordInfoPayload.cs b/Intuit.QuickBase.Core/Payload/GetRecordInfoPayload.cs
index 7103522..b71ef55 100644
--- a/Intuit.QuickBase.Core/Payload/GetRecordInfoPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/GetRecordInfoPayload.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -28,9 +29,9 @@ private int Rid
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<rid>{0}</rid>", Rid);
+            parent.Add(new XElement("rid", Rid));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/GetRoleInfoPayload.cs b/Intuit.QuickBase.Core/Payload/GetRoleInfoPayload.cs
index ba85ae1..a024326 100644
--- a/Intuit.QuickBase.Core/Payload/GetRoleInfoPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/GetRoleInfoPayload.cs
@@ -6,14 +6,15 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
     internal class GetRoleInfoPayload : Payload
     {
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Empty;
+            //do nothing
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/GetSchemaPayload.cs b/Intuit.QuickBase.Core/Payload/GetSchemaPayload.cs
index 7cce6bf..5c4c82b 100644
--- a/Intuit.QuickBase.Core/Payload/GetSchemaPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/GetSchemaPayload.cs
@@ -6,14 +6,15 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
     internal class GetSchemaPayload : Payload
     {
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Empty;
+            //do nothing
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/GetUserInfoPayload.cs b/Intuit.QuickBase.Core/Payload/GetUserInfoPayload.cs
index 430e5d2..44c72a2 100644
--- a/Intuit.QuickBase.Core/Payload/GetUserInfoPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/GetUserInfoPayload.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -31,9 +32,9 @@ private string Email
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return !String.IsNullOrEmpty(Email) ? String.Format("<email>{0}</email>", Email) : String.Empty;
+            if (!string.IsNullOrEmpty(Email)) parent.Add(new XElement("email", Email));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/GetUserRolePayload.cs b/Intuit.QuickBase.Core/Payload/GetUserRolePayload.cs
index 7d1f9d6..9f5314a 100644
--- a/Intuit.QuickBase.Core/Payload/GetUserRolePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/GetUserRolePayload.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -29,9 +30,9 @@ private string UserId
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<userid>{0}</userid>", UserId);
+            parent.Add(new XElement("userid", UserId));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/GrantDBsPayload.cs b/Intuit.QuickBase.Core/Payload/GrantDBsPayload.cs
index 4870622..3f0cd66 100644
--- a/Intuit.QuickBase.Core/Payload/GrantDBsPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/GrantDBsPayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -52,13 +53,11 @@ private GrantDBsPayload(Builder builder)
             _adminOnly = builder.AdminOnly;
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(_excludeParents ? "<Excludeparents>1</Excludeparents>" : "<Excludeparents>0</Excludeparents>");
-            sb.Append(_withEmbeddedTables ? "<withembeddedtables>1</withembeddedtables>" : "<withembeddedtables>0</withembeddedtables>");
-            sb.Append(_adminOnly ? "<adminOnly/>" : String.Empty);
-            return sb.ToString();
+            parent.Add(new XElement("Excludeparents", _excludeParents ? 1 : 0));
+            parent.Add(new XElement("withembeddedtables", _withEmbeddedTables ? 1 : 0));
+            if (_adminOnly) parent.Add(new XElement("adminOnly"));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/ImportFromCSVPayload.cs b/Intuit.QuickBase.Core/Payload/ImportFromCSVPayload.cs
index c45f652..4ac1b18 100644
--- a/Intuit.QuickBase.Core/Payload/ImportFromCSVPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/ImportFromCSVPayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -15,6 +16,7 @@ internal class ImportFromCSVPayload : Payload
         private readonly string _recordsCsv;
         private readonly string _cList;
         private readonly bool _skipFirst;
+        private readonly bool _timeInUtc;
 
         internal class Builder
         {
@@ -39,6 +41,13 @@ internal Builder SetSkipFirst(bool val)
                 return this;
             }
 
+            internal bool TimeInUtc { get; private set; }
+            internal Builder SetTimeInUtc(bool val)
+            {
+                TimeInUtc = val;
+                return this;
+            }
+
             internal ImportFromCSVPayload Build()
             {
                 return new ImportFromCSVPayload(this);
@@ -50,15 +59,15 @@ private ImportFromCSVPayload(Builder builder)
             _recordsCsv = builder.RecordsCsv;
             _cList = builder.CList;
             _skipFirst = builder.SkipFirst;
+            _timeInUtc = builder.TimeInUtc;
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(String.Format("<records_csv><![CDATA[{0}]]></records_csv>", _recordsCsv));
-            sb.Append((!String.IsNullOrEmpty(_cList)) ? String.Format("<clist>{0}</clist>", _cList) : String.Empty);
-            sb.Append(_skipFirst ? "<skipfirst>1</skipfirst>" : String.Empty);
-            return sb.ToString();
+            parent.Add(new XElement("records_csv", new XCData(_recordsCsv)));
+            if (!string.IsNullOrEmpty(_cList)) parent.Add(new XElement("clist", _cList));
+            if (_skipFirst) parent.Add(new XElement("skipfirst", 1));
+            if (_timeInUtc) parent.Add(new XElement("msInUTC", 1));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/Payload.cs b/Intuit.QuickBase.Core/Payload/Payload.cs
index e59eb69..e9ec015 100644
--- a/Intuit.QuickBase.Core/Payload/Payload.cs
+++ b/Intuit.QuickBase.Core/Payload/Payload.cs
@@ -5,10 +5,12 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
+using System.Xml.Linq;
+
 namespace Intuit.QuickBase.Core.Payload
 {
     internal abstract class Payload
     {
-        internal abstract string GetXmlPayload();
+        internal abstract void GetXmlPayload(ref XElement parent);
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Payload/ProvisionUserPayload.cs b/Intuit.QuickBase.Core/Payload/ProvisionUserPayload.cs
index 4f5efc2..39d796b 100644
--- a/Intuit.QuickBase.Core/Payload/ProvisionUserPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/ProvisionUserPayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -73,13 +74,12 @@ private string LastName
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(String.Format("<email>{0}</email><fname>{1}</fname><lname>{2}</lname>",
-                Email, FirstName, LastName));
-            sb.Append(RoleId > 0 ? String.Format("<roleid>{0}</roleid>", RoleId) : String.Empty);
-            return sb.ToString();
+            parent.Add(new XElement("email", Email));
+            parent.Add(new XElement("fname", FirstName));
+            parent.Add(new XElement("lname", LastName));
+            if (RoleId > 0) parent.Add(new XElement("roleid", RoleId));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/PurgeRecordsPayload.cs b/Intuit.QuickBase.Core/Payload/PurgeRecordsPayload.cs
index be132a3..ab4b9a9 100644
--- a/Intuit.QuickBase.Core/Payload/PurgeRecordsPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/PurgeRecordsPayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -52,13 +53,11 @@ private PurgeRecordsPayload(Builder builder)
             _qname = builder.QName;
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(!String.IsNullOrEmpty(_query) ? String.Format("<query>{0}</query>", _query) : String.Empty);
-            sb.Append(_qid > 0 ? String.Format("<qid>{0}</qid>", _qid) : String.Empty);
-            sb.Append(!String.IsNullOrEmpty(_qname) ? String.Format("<qname>{0}</qname>", _qname) : String.Empty);
-            return sb.ToString();
+            if (!string.IsNullOrEmpty(_query)) parent.Add(new XElement("query", _query));
+            if (_qid > 0) parent.Add(new XElement("qid", _qid));
+            if (!string.IsNullOrEmpty(_qname)) parent.Add(new XElement("qname", _qname));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/RemoveUserFromRolePayload.cs b/Intuit.QuickBase.Core/Payload/RemoveUserFromRolePayload.cs
index 9c612aa..ddafb0a 100644
--- a/Intuit.QuickBase.Core/Payload/RemoveUserFromRolePayload.cs
+++ b/Intuit.QuickBase.Core/Payload/RemoveUserFromRolePayload.cs
@@ -6,6 +6,8 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -41,9 +43,10 @@ private int RoleId
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<userid>{0}</userid><roleid>{1}</roleid>", UserId, RoleId);
+            parent.Add(new XElement("userid", UserId));
+            parent.Add(new XElement("roleid", RoleId));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/RenameAppPayload.cs b/Intuit.QuickBase.Core/Payload/RenameAppPayload.cs
index 3cdb0ea..4685e17 100644
--- a/Intuit.QuickBase.Core/Payload/RenameAppPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/RenameAppPayload.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -29,9 +30,9 @@ private string NewAppName
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<newappname>{0}</newappname>", NewAppName);
+            parent.Add(new XElement("newappname", NewAppName));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/RunImportPayload.cs b/Intuit.QuickBase.Core/Payload/RunImportPayload.cs
index e9a6071..b8ac724 100644
--- a/Intuit.QuickBase.Core/Payload/RunImportPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/RunImportPayload.cs
@@ -6,6 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -28,9 +29,9 @@ private int Id
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<id>{0}</id>", Id);
+            parent.Add(new XElement("id", Id));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/SendInvitationPayload.cs b/Intuit.QuickBase.Core/Payload/SendInvitationPayload.cs
index 59b03d7..ea340db 100644
--- a/Intuit.QuickBase.Core/Payload/SendInvitationPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/SendInvitationPayload.cs
@@ -7,6 +7,7 @@
  */
 using System;
 using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -48,14 +49,10 @@ private string UserText
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            var sb = new StringBuilder();
-            sb.Append(String.Format("<userid>{0}</userid>", UserId));
-            sb.Append(!String.IsNullOrEmpty(UserText)
-                          ? String.Format("<usertext>{0}</usertext>", UserText)
-                          : String.Empty);
-            return sb.ToString();
+            parent.Add(new XElement("userid", UserId));
+            if (!string.IsNullOrEmpty(UserText))  parent.Add(new XElement("usertext", UserText));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/SetDBvarPayload.cs b/Intuit.QuickBase.Core/Payload/SetDBvarPayload.cs
index db080f2..34bde8c 100644
--- a/Intuit.QuickBase.Core/Payload/SetDBvarPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/SetDBvarPayload.cs
@@ -6,6 +6,8 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Text;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
@@ -42,9 +44,10 @@ private string Value
             }
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Format("<varname>{0}</varname><value>{1}</value>", VarName, Value);
+            parent.Add(new XElement("varname", VarName));
+            parent.Add(new XElement("value", Value));
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/SignOutPayload.cs b/Intuit.QuickBase.Core/Payload/SignOutPayload.cs
index f47b77a..3e0c09f 100644
--- a/Intuit.QuickBase.Core/Payload/SignOutPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/SignOutPayload.cs
@@ -6,14 +6,15 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
     internal class SignOutPayload : Payload
     {
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Empty;
+            //do nothing
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/Payload/UserRolesPayload.cs b/Intuit.QuickBase.Core/Payload/UserRolesPayload.cs
index 93bf33f..44e694d 100644
--- a/Intuit.QuickBase.Core/Payload/UserRolesPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/UserRolesPayload.cs
@@ -6,14 +6,15 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
+using System.Xml.Linq;
 
 namespace Intuit.QuickBase.Core.Payload
 {
     internal class UserRolesPayload : Payload
     {
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return String.Empty;
+            //do nothing
         }
     }
 }
\ No newline at end of file
diff --git a/Intuit.QuickBase.Core/Payload/WrapPayload.cs b/Intuit.QuickBase.Core/Payload/WrapPayload.cs
index 542a97e..8217ff7 100644
--- a/Intuit.QuickBase.Core/Payload/WrapPayload.cs
+++ b/Intuit.QuickBase.Core/Payload/WrapPayload.cs
@@ -5,18 +5,21 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
+
+using System.Xml.Linq;
+
 namespace Intuit.QuickBase.Core.Payload
 {
     internal class WrapPayload : PayloadDecorator
     {
-        internal WrapPayload(Payload paylaod)
+        internal WrapPayload(Payload payload)
         {
-            Payload = paylaod;
+            Payload = payload;
         }
 
-        internal override string GetXmlPayload()
+        internal override void GetXmlPayload(ref XElement parent)
         {
-            return string.Format("<qdbapi>{0}</qdbapi>", Payload.GetXmlPayload());
+            Payload.GetXmlPayload(ref parent);
         }
     }
 }
diff --git a/Intuit.QuickBase.Core/ProvisionUser.cs b/Intuit.QuickBase.Core/ProvisionUser.cs
index 384925a..2922f25 100644
--- a/Intuit.QuickBase.Core/ProvisionUser.cs
+++ b/Intuit.QuickBase.Core/ProvisionUser.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,31 +18,36 @@ public class ProvisionUser : IQObject
         private Payload.Payload _provisionUserPayload;
         private IQUri _uri;
 
-        public ProvisionUser(string ticket, string appToken, string accountDomain, string dbid, string email, int roleId, string firstName, string lastName)
+        public ProvisionUser(string ticket, string appToken, string accountDomain, string dbid, string email, int roleId, string firstName, string lastName, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new ProvisionUserPayload(email, roleId, firstName, lastName));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new ProvisionUserPayload(email, roleId, firstName, lastName), userToken);
         }
 
-        public ProvisionUser(string ticket, string appToken, string accountDomain, string dbid, string email, string firstName, string lastName)
+        public ProvisionUser(string ticket, string appToken, string accountDomain, string dbid, string email, string firstName, string lastName, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new ProvisionUserPayload(email, firstName, lastName));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new ProvisionUserPayload(email, firstName, lastName), userToken);
         }
 
-        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload)
+        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload, string userToken = "")
         {
-            _provisionUserPayload = new ApplicationTicket(payload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _provisionUserPayload = new ApplicationUserToken(payload, userToken);
+            }
+            else
+            {
+                _provisionUserPayload = new ApplicationTicket(payload, ticket);
+            }
             _provisionUserPayload = new ApplicationToken(_provisionUserPayload, appToken);
             _provisionUserPayload = new WrapPayload(_provisionUserPayload);
 
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _provisionUserPayload.GetXmlPayload();
-            }
+            _provisionUserPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -60,7 +66,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/PurgeRecords.cs b/Intuit.QuickBase.Core/PurgeRecords.cs
index 2d8f892..4339c29 100644
--- a/Intuit.QuickBase.Core/PurgeRecords.cs
+++ b/Intuit.QuickBase.Core/PurgeRecords.cs
@@ -6,7 +6,7 @@
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
 using System;
-using System.Xml.XPath;
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -33,13 +33,15 @@ public class PurgeRecords : IQObject
         public class Builder
         {
             internal string Ticket { get; set; }
+            internal string UserToken { get; set; }
             internal string AppToken { get; set; }
             internal string AccountDomain { get; set; }
             internal string Dbid { get; set; }
 
-            public Builder(string ticket, string appToken, string accountDomain, string dbid)
+            public Builder(string ticket, string appToken, string accountDomain, string dbid, string userToken = "")
             {
                 Ticket = ticket;
+                UserToken = userToken;
                 AppToken = appToken;
                 AccountDomain = accountDomain;
                 Dbid = dbid;
@@ -87,18 +89,23 @@ private PurgeRecords(Builder builder)
                 .SetQid(builder.Qid)
                 .SetQName(builder.QName)
                 .Build();
-            _purgeRecordsPayload = new ApplicationTicket(_purgeRecordsPayload, builder.Ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (builder.UserToken.Length > 0)
+            {
+                _purgeRecordsPayload = new ApplicationUserToken(_purgeRecordsPayload, builder.UserToken);
+            }
+            else
+            {
+                _purgeRecordsPayload = new ApplicationTicket(_purgeRecordsPayload, builder.Ticket);
+            }
             _purgeRecordsPayload = new ApplicationToken(_purgeRecordsPayload, builder.AppToken);
             _purgeRecordsPayload = new WrapPayload(_purgeRecordsPayload);
             _uri = new QUriDbid(builder.AccountDomain, builder.Dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _purgeRecordsPayload.GetXmlPayload();
-            }
+            _purgeRecordsPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -117,7 +124,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/RemoveUserFromRole.cs b/Intuit.QuickBase.Core/RemoveUserFromRole.cs
index 68aaa58..bd426b6 100644
--- a/Intuit.QuickBase.Core/RemoveUserFromRole.cs
+++ b/Intuit.QuickBase.Core/RemoveUserFromRole.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,21 +18,26 @@ public class RemoveUserFromRole : IQObject
         private readonly Payload.Payload _removeUserFromRolePayload;
         private readonly IQUri _uri;
 
-        public RemoveUserFromRole(string ticket, string appToken, string accountDomain, string dbid, string userId, int roleId)
+        public RemoveUserFromRole(string ticket, string appToken, string accountDomain, string dbid, string userId, int roleId, string userToken = "")
         {
             _removeUserFromRolePayload = new RemoveUserFromRolePayload(userId, roleId);
-            _removeUserFromRolePayload = new ApplicationTicket(_removeUserFromRolePayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _removeUserFromRolePayload = new ApplicationUserToken(_removeUserFromRolePayload, userToken);
+            }
+            else
+            {
+                _removeUserFromRolePayload = new ApplicationTicket(_removeUserFromRolePayload, ticket);
+            }
             _removeUserFromRolePayload = new ApplicationToken(_removeUserFromRolePayload, appToken);
             _removeUserFromRolePayload = new WrapPayload(_removeUserFromRolePayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _removeUserFromRolePayload.GetXmlPayload();
-            }
+            _removeUserFromRolePayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -50,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/RenameApp.cs b/Intuit.QuickBase.Core/RenameApp.cs
index 7ff0a0e..5171c47 100644
--- a/Intuit.QuickBase.Core/RenameApp.cs
+++ b/Intuit.QuickBase.Core/RenameApp.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -30,21 +31,27 @@ public class RenameApp : IQObject
         /// <param name="accountDomain"></param>
         /// <param name="dbid">Supply application-level dbid.</param>
         /// <param name="newAppName">Supply a new application name.</param>
-        public RenameApp(string ticket, string appToken, string accountDomain, string dbid, string newAppName)
+        /// <param name="userToken">optional user token that can be used instead of a ticket</param>
+        public RenameApp(string ticket, string appToken, string accountDomain, string dbid, string newAppName, string userToken = "")
         {
             _renameAppPayload = new RenameAppPayload(newAppName);
-            _renameAppPayload = new ApplicationTicket(_renameAppPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _renameAppPayload = new ApplicationUserToken(_renameAppPayload, userToken);
+            }
+            else
+            {
+                _renameAppPayload = new ApplicationTicket(_renameAppPayload, ticket);
+            }
             _renameAppPayload = new ApplicationToken(_renameAppPayload, appToken);
             _renameAppPayload = new WrapPayload(_renameAppPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _renameAppPayload.GetXmlPayload();
-            }
+            _renameAppPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -63,7 +70,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/RunImport.cs b/Intuit.QuickBase.Core/RunImport.cs
index 11484d8..964454f 100644
--- a/Intuit.QuickBase.Core/RunImport.cs
+++ b/Intuit.QuickBase.Core/RunImport.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,21 +18,26 @@ public class RunImport : IQObject
         private readonly Payload.Payload _runImportPayload;
         private readonly IQUri _uri;
 
-        public RunImport(string ticket, string appToken, string accountDomain, string dbid, int id)
+        public RunImport(string ticket, string appToken, string accountDomain, string dbid, int id, string userToken = "")
         {
             _runImportPayload = new RunImportPayload(id);
-            _runImportPayload = new ApplicationTicket(_runImportPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _runImportPayload = new ApplicationUserToken(_runImportPayload, userToken);
+            }
+            else
+            {
+                _runImportPayload = new ApplicationTicket(_runImportPayload, ticket);
+            }
             _runImportPayload = new ApplicationToken(_runImportPayload, appToken);
             _runImportPayload = new WrapPayload(_runImportPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _runImportPayload.GetXmlPayload();
-            }
+            _runImportPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -50,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/SendInvitation.cs b/Intuit.QuickBase.Core/SendInvitation.cs
index 683f2ba..83d9996 100644
--- a/Intuit.QuickBase.Core/SendInvitation.cs
+++ b/Intuit.QuickBase.Core/SendInvitation.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,30 +18,35 @@ public class SendInvitation : IQObject
         private Payload.Payload _sendInvitationPayload;
         private IQUri _uri;
 
-        public SendInvitation(string ticket, string appToken, string accountDomain, string dbid, string userId, string userText)
+        public SendInvitation(string ticket, string appToken, string accountDomain, string dbid, string userId, string userText, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new SendInvitationPayload(userId, userText));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new SendInvitationPayload(userId, userText), userToken);
         }
 
-        public SendInvitation(string ticket, string appToken, string accountDomain, string dbid, string userId)
+        public SendInvitation(string ticket, string appToken, string accountDomain, string dbid, string userId, string userToken = "")
         {
-            CommonConstruction(ticket, appToken, accountDomain, dbid, new SendInvitationPayload(userId));
+            CommonConstruction(ticket, appToken, accountDomain, dbid, new SendInvitationPayload(userId), userToken);
         }
 
-        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload)
+        private void CommonConstruction(string ticket, string appToken, string accountDomain, string dbid, Payload.Payload payload, string userToken = "")
         {
-            _sendInvitationPayload = new ApplicationTicket(payload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _sendInvitationPayload = new ApplicationUserToken(payload, userToken);
+            }
+            else
+            {
+                _sendInvitationPayload = new ApplicationTicket(payload, ticket);
+            }
             _sendInvitationPayload = new ApplicationToken(_sendInvitationPayload, appToken);
             _sendInvitationPayload = new WrapPayload(_sendInvitationPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _sendInvitationPayload.GetXmlPayload();
-            }
+            _sendInvitationPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -59,7 +65,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/SetDBvar.cs b/Intuit.QuickBase.Core/SetDBvar.cs
index 5ff89aa..aec6c9b 100644
--- a/Intuit.QuickBase.Core/SetDBvar.cs
+++ b/Intuit.QuickBase.Core/SetDBvar.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,21 +18,26 @@ public class SetDBvar : IQObject
         private readonly Payload.Payload _setDbVarPayload;
         private readonly IQUri _uri;
 
-        public SetDBvar(string ticket, string appToken, string accountDomain, string dbid, string varName, string value)
+        public SetDBvar(string ticket, string appToken, string accountDomain, string dbid, string varName, string value, string userToken = "")
         {
             _setDbVarPayload = new SetDBvarPayload(varName, value);
-            _setDbVarPayload = new ApplicationTicket(_setDbVarPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _setDbVarPayload = new ApplicationUserToken(_setDbVarPayload, userToken);
+            }
+            else
+            {
+                _setDbVarPayload = new ApplicationTicket(_setDbVarPayload, ticket);
+            }
             _setDbVarPayload = new ApplicationToken(_setDbVarPayload, appToken);
             _setDbVarPayload = new WrapPayload(_setDbVarPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _setDbVarPayload.GetXmlPayload();
-            }
+            _setDbVarPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -50,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/SignOut.cs b/Intuit.QuickBase.Core/SignOut.cs
index 6c5606f..f9e2225 100644
--- a/Intuit.QuickBase.Core/SignOut.cs
+++ b/Intuit.QuickBase.Core/SignOut.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -33,12 +34,9 @@ public SignOut(string accountDomain)
             _uri = new QUriMain(accountDomain);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _signOutPayload.GetXmlPayload();
-            }
+            _signOutPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -57,7 +55,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/UserRoles.cs b/Intuit.QuickBase.Core/UserRoles.cs
index b1dca22..331104d 100644
--- a/Intuit.QuickBase.Core/UserRoles.cs
+++ b/Intuit.QuickBase.Core/UserRoles.cs
@@ -5,7 +5,8 @@
  * which accompanies this distribution, and is available at
  * http://www.opensource.org/licenses/eclipse-1.0.php
  */
-using System.Xml.XPath;
+
+using System.Xml.Linq;
 using Intuit.QuickBase.Core.Payload;
 using Intuit.QuickBase.Core.Uri;
 
@@ -17,21 +18,26 @@ public class UserRoles : IQObject
         private readonly Payload.Payload _userRolesPayload;
         private readonly IQUri _uri;
 
-        public UserRoles(string ticket, string appToken, string accountDomain, string dbid)
+        public UserRoles(string ticket, string appToken, string accountDomain, string dbid, string userToken = "")
         {
             _userRolesPayload = new UserRolesPayload();
-            _userRolesPayload = new ApplicationTicket(_userRolesPayload, ticket);
+            //If a user token is provided, use it instead of a ticket
+            if (userToken.Length > 0)
+            {
+                _userRolesPayload = new ApplicationUserToken(_userRolesPayload, userToken);
+            }
+            else
+            {
+                _userRolesPayload = new ApplicationTicket(_userRolesPayload, ticket);
+            }
             _userRolesPayload = new ApplicationToken(_userRolesPayload, appToken);
             _userRolesPayload = new WrapPayload(_userRolesPayload);
             _uri = new QUriDbid(accountDomain, dbid);
         }
 
-        public string XmlPayload
+        public void BuildXmlPayload(ref XElement parent)
         {
-            get
-            {
-                return _userRolesPayload.GetXmlPayload();
-            }
+            _userRolesPayload.GetXmlPayload(ref parent);
         }
 
         public System.Uri Uri
@@ -50,7 +56,7 @@ public string Action
             }
         }
 
-        public XPathDocument Post()
+        public XElement Post()
         {
             HttpPost httpXml = new HttpPostXml();
             httpXml.Post(this);
diff --git a/Intuit.QuickBase.Core/packages.config b/Intuit.QuickBase.Core/packages.config
new file mode 100644
index 0000000..e5b4424
--- /dev/null
+++ b/Intuit.QuickBase.Core/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.CodeAnalysis.NetAnalyzers" version="6.0.0" targetFramework="net462" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/Intuit.QuickBase.sln b/Intuit.QuickBase.sln
index 15d6769..25e5ac7 100644
--- a/Intuit.QuickBase.sln
+++ b/Intuit.QuickBase.sln
@@ -1,25 +1,15 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.852
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Intuit.QuickBase.Client", "Intuit.QuickBase.Client\Intuit.QuickBase.Client.csproj", "{F25380B0-B55A-4567-941E-B938723F6E07}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Intuit.QuickBase.Core", "Intuit.QuickBase.Core\Intuit.QuickBase.Core.csproj", "{72AE7ED2-1321-499E-8E0E-ECFD91B8C850}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Intuit.QuickBase.UnitTests", "Intuit.QuickBase.UnitTests\Intuit.QuickBase.UnitTests.csproj", "{F5896BE7-8236-4A53-AACB-E6F33A436D04}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Library", "Library", "{2E052995-62F2-44FD-BD11-D481FB2C687C}"
-	ProjectSection(SolutionItems) = preProject
-		Library\nunit.framework.dll = Library\nunit.framework.dll
-		Library\Rhino.Mocks.dll = Library\Rhino.Mocks.dll
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Intuit.QuickBase.IntegrationTests", "Intuit.QuickBase.IntegrationTests\Intuit.QuickBase.IntegrationTests.csproj", "{D88A7B14-7A52-4A78-B51C-D33BA947F551}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QBFunctionTest", "QBFunctionTest\QBFunctionTest.csproj", "{0ECE8A75-198C-4DBA-83D8-E12CE882E6BC}"
 EndProject
 Global
-	GlobalSection(SubversionScc) = preSolution
-		Svn-Managed = True
-		Manager = AnkhSVN - Subversion Support for Visual Studio
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -33,16 +23,19 @@ Global
 		{72AE7ED2-1321-499E-8E0E-ECFD91B8C850}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{72AE7ED2-1321-499E-8E0E-ECFD91B8C850}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{72AE7ED2-1321-499E-8E0E-ECFD91B8C850}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5896BE7-8236-4A53-AACB-E6F33A436D04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5896BE7-8236-4A53-AACB-E6F33A436D04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5896BE7-8236-4A53-AACB-E6F33A436D04}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5896BE7-8236-4A53-AACB-E6F33A436D04}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D88A7B14-7A52-4A78-B51C-D33BA947F551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D88A7B14-7A52-4A78-B51C-D33BA947F551}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D88A7B14-7A52-4A78-B51C-D33BA947F551}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D88A7B14-7A52-4A78-B51C-D33BA947F551}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0ECE8A75-198C-4DBA-83D8-E12CE882E6BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0ECE8A75-198C-4DBA-83D8-E12CE882E6BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0ECE8A75-198C-4DBA-83D8-E12CE882E6BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0ECE8A75-198C-4DBA-83D8-E12CE882E6BC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D09DDA99-3831-4FCE-8E03-BEB89BEDAC2B}
+	EndGlobalSection
+	GlobalSection(SubversionScc) = preSolution
+		Svn-Managed = True
+		Manager = AnkhSVN - Subversion Support for Visual Studio
+	EndGlobalSection
 EndGlobal
diff --git a/Library/Rhino.Mocks.dll b/Library/Rhino.Mocks.dll
deleted file mode 100644
index 4b6904b..0000000
Binary files a/Library/Rhino.Mocks.dll and /dev/null differ
diff --git a/Library/nunit.framework.dll b/Library/nunit.framework.dll
deleted file mode 100644
index 2729ddf..0000000
Binary files a/Library/nunit.framework.dll and /dev/null differ
diff --git a/QBFunctionTest/Properties/AssemblyInfo.cs b/QBFunctionTest/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..c39ab15
--- /dev/null
+++ b/QBFunctionTest/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("QBFunctionTest")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("QBFunctionTest")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("4ded4099-2ccc-46b5-8196-a3c531ab0a59")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/QBFunctionTest/Properties/Settings.Designer.cs b/QBFunctionTest/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..2460f0e
--- /dev/null
+++ b/QBFunctionTest/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace QBFunctionTest.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/QBFunctionTest/Properties/Settings.settings b/QBFunctionTest/Properties/Settings.settings
new file mode 100644
index 0000000..8e615f2
--- /dev/null
+++ b/QBFunctionTest/Properties/Settings.settings
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles />
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/QBFunctionTest/QBFunctionTest.csproj b/QBFunctionTest/QBFunctionTest.csproj
new file mode 100644
index 0000000..77d256b
--- /dev/null
+++ b/QBFunctionTest/QBFunctionTest.csproj
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{0ECE8A75-198C-4DBA-83D8-E12CE882E6BC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>QBFunctionTest</RootNamespace>
+    <AssemblyName>QBFunctionTest</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet />
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet />
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.XML" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="UnitTest1.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Intuit.QuickBase.Client\Intuit.QuickBase.Client.csproj">
+      <Project>{f25380b0-b55a-4567-941e-b938723f6e07}</Project>
+      <Name>Intuit.QuickBase.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Intuit.QuickBase.Core\Intuit.QuickBase.Core.csproj">
+      <Project>{72ae7ed2-1321-499e-8e0e-ecfd91b8c850}</Project>
+      <Name>Intuit.QuickBase.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="TestConfigs.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/QBFunctionTest/Settings.aiis b/QBFunctionTest/Settings.aiis
new file mode 100644
index 0000000..0a82f1a
--- /dev/null
+++ b/QBFunctionTest/Settings.aiis
@@ -0,0 +1,258 @@
+{
+  "__type": "ArtOfTest.WebAii.Design.UserSettings",
+  "__value": {
+    "UseHttpProxy": false,
+    "RecordjQueryInDescriptorsIfPossible": true,
+    "ShouldDeleteElement": false,
+    "SkipDeleteElementPrompt": false,
+    "HideFindExpressionWelcome": false,
+    "MenuHoldTime": 1.0,
+    "SilverlightConnectTimeout": 60000,
+    "BaseClassName": "BaseWebAiiTest",
+    "UrlRecordMode": 1,
+    "HighlightBorderColor": -65536,
+    "HighlightBorderSize": 1,
+    "CodeGenerationElementIdentificationType": 1,
+    "UrlHistory": [],
+    "AbsoluteDragDropRecording": true,
+    "ShowStoryboardHorizontalLayout": false,
+    "ImageScalePercentage": 75,
+    "SkipTranslatorsOptimization": false,
+    "SelectedIdentificaitonScheme": "Html",
+    "IdentificationSchemes": {
+      "Html": {
+        "__type": "ArtOfTest.Common.Design.Translation.IdentificationOptionsScheme",
+        "__value": {
+          "CheckFindParamUniqueness": true,
+          "AutoDetectTestRegions": true,
+          "TryAttributeCombinations": true,
+          "AlwaysAssertTagName": true,
+          "IdentificationsPerTag": {
+            "All Elements": {
+              "__type": "ArtOfTest.Common.Design.Translation.IdentificationDescriptorList",
+              "__value": [
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.HtmlIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": false,
+                    "SearchType": 0,
+                    "AttributeName": "id"
+                  }
+                },
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.HtmlIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": false,
+                    "SearchType": 0,
+                    "AttributeName": "name"
+                  }
+                },
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.HtmlIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": false,
+                    "SearchType": 0,
+                    "AttributeName": "src"
+                  }
+                },
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.HtmlIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": false,
+                    "SearchType": 0,
+                    "AttributeName": "href"
+                  }
+                },
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.HtmlIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": false,
+                    "SearchType": 0,
+                    "AttributeName": "value"
+                  }
+                },
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.HtmlIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": false,
+                    "SearchType": 0,
+                    "AttributeName": "alt"
+                  }
+                },
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.HtmlIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": true,
+                    "SearchType": 1,
+                    "AttributeName": null
+                  }
+                },
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.HtmlIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": true,
+                    "SearchType": 8,
+                    "AttributeName": null
+                  }
+                }
+              ]
+            }
+          },
+          "TechnologyType": 1
+        }
+      },
+      "Silverlight": {
+        "__type": "ArtOfTest.Common.Design.Translation.IdentificationOptionsScheme",
+        "__value": {
+          "CheckFindParamUniqueness": true,
+          "AutoDetectTestRegions": true,
+          "TryAttributeCombinations": true,
+          "AlwaysAssertTagName": true,
+          "IdentificationsPerTag": {
+            "All Elements": {
+              "__type": "ArtOfTest.Common.Design.Translation.IdentificationDescriptorList",
+              "__value": [
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.Silverlight.SilverlightIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": false,
+                    "SearchType": 0,
+                    "AttributeName": null
+                  }
+                },
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.Silverlight.SilverlightIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": false,
+                    "SearchType": 5,
+                    "AttributeName": null
+                  }
+                },
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.Silverlight.SilverlightIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": false,
+                    "SearchType": 1,
+                    "AttributeName": null
+                  }
+                },
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.Silverlight.SilverlightIdentificationDescriptor",
+                  "__value": {
+                    "IsLocked": true,
+                    "SearchType": 6,
+                    "AttributeName": null
+                  }
+                }
+              ]
+            }
+          },
+          "TechnologyType": 2
+        }
+      },
+      "Desktop": {
+        "__type": "ArtOfTest.Common.Design.Translation.IdentificationOptionsScheme",
+        "__value": {
+          "CheckFindParamUniqueness": true,
+          "AutoDetectTestRegions": true,
+          "TryAttributeCombinations": true,
+          "AlwaysAssertTagName": true,
+          "IdentificationsPerTag": {
+            "All Elements": {
+              "__type": "ArtOfTest.Common.Design.Translation.IdentificationDescriptorList",
+              "__value": [
+                {
+                  "__type": "ArtOfTest.WebAii.Design.Translation.Desktop.DesktopIdentificationDescriptor",
+                  "__value": {
+                    "PropertyName": "ControlTypeName",
+                    "IsLocked": true
+                  }
+                }
+              ]
+            }
+          },
+          "TechnologyType": 8
+        }
+      }
+    },
+    "UnitTypeTypeGeneration": 1,
+    "RecorderBaseUrl": "",
+    "IsStoryBoardCapturingEnabled": true,
+    "IsElementImageCapturingEnabled": true,
+    "UseScreenshotCache": true,
+    "EnableImageSearch": true,
+    "UseBrowserExtension": false,
+    "ChromiumFirstInteractionDelay": 500,
+    "ClientMessageReceivedTimeout": 1000,
+    "FirefoxMinimumJSClickDelay": 100,
+    "TelerikComponentsVersion": 0,
+    "ScrollOnImageSearch": true,
+    "DisplayElementImagePreview": true,
+    "ElementImageThreshold": 90,
+    "ElementImageSearchTimeout": 15000,
+    "SearchByImageFirst": false,
+    "ElementImageSearchDelay": 300,
+    "SimulateRealClickByDefault": true,
+    "SimulateRealTypingByDefault": true,
+    "DefaultDropDownSelection": 2,
+    "QuickExecutionElementWaitTimeout": 15000,
+    "QuickExecutionClientReadyTimeout": 60000,
+    "TfsUserName": "",
+    "TfsPassword": "",
+    "TfsSkipAuthDialog": true,
+    "TfsDomain": "",
+    "RecordWpfWindowStateChanged": false,
+    "PromptNameOnAddElement": true,
+    "DefaultWPFApplication": null,
+    "DefaultWPFApplicationArgs": null,
+    "DefaultWPFApplicationWorkingFolder": null,
+    "DefaultDesktopApplication": null,
+    "DefaultDesktopApplicationArgs": null,
+    "DefaultDesktopApplicationWorkingFolder": null,
+    "UseLegacySilverlightFindLogic": false,
+    "ProjectGuid": "08c587fc-98b1-4508-a0fd-5e3ad5454f8c",
+    "SourceControlRepository": null,
+    "IsOnline": false,
+    "ProjectLanguage": 2,
+    "ProjectReferences": [
+      "System",
+      "System.Core",
+      "ArtOfTest.WebAii, Version=2024.4.1329.1, Culture=neutral, PublicKeyToken=4fd5f65be123776c",
+      "ArtOfTest.WebAii.Messaging, Version=2024.4.1329.1, Culture=neutral, PublicKeyToken=4fd5f65be123776c",
+      "ArtOfTest.WebAii.Design, Version=2024.4.1329.1, Culture=neutral, PublicKeyToken=4fc62bbc3827ab1d",
+      "Telerik.WebAii.Controls.Html, Version=2024.4.1329.1, Culture=neutral, PublicKeyToken=528163f3e645de45",
+      "Telerik.WebAii.Controls.Xaml, Version=2024.4.1329.1, Culture=neutral, PublicKeyToken=528163f3e645de45",
+      "Telerik.WebAii.Controls.Xaml.Wpf, Version=2024.4.1329.1, Culture=neutral, PublicKeyToken=528163f3e645de45",
+      "Telerik.TestingFramework.Controls.KendoUI, Version=2024.4.1329.1, Culture=neutral, PublicKeyToken=528163f3e645de45",
+      "Telerik.TestingFramework.Controls.KendoUI.Angular, Version=2024.4.1329.1, Culture=neutral, PublicKeyToken=528163f3e645de45",
+      "Telerik.TestingFramework.Controls.TelerikUI.Blazor, Version=2024.4.1329.1, Culture=neutral, PublicKeyToken=528163f3e645de45",
+      "Telerik.TestStudio.Translators.Common, Version=2024.4.1329.1, Culture=neutral, PublicKeyToken=528163f3e645de45"
+    ],
+    "ScheduleServerUrl": "http://localhost:8009/",
+    "IsScheduleServerRemote": false,
+    "NotificationSettings": null,
+    "WebComponents": true,
+    "ProjectVersion": "2024.4.1321.0",
+    "Namespace": "QBFunctionTest",
+    "AssemblyName": "QBFunctionTest",
+    "OutputFolder": "bin",
+    "ExcludedFiles": [],
+    "InDevelopmentFiles": [],
+    "DisabledTranslators": [],
+    "SkipFindExpressionSetDataDrivenWarning": false,
+    "BugTrackerPersistableSettings": {},
+    "ActiveBugTrackers": [],
+    "BugTitleMask": "{Step name} step on {Test name} test failed.",
+    "BugAddAttachment": true,
+    "BugAutoSubmit": false,
+    "BugDescriptionMask": "{Description}",
+    "SelectedBrowserOption": 0,
+    "SelectedResponsiveBrowserOption": 0,
+    "ResponsiveBrowserDevice": null,
+    "ResponsiveBrowserWidth": 375,
+    "ResponsiveBrowserHeight": 812,
+    "ResponsiveBrowserUserAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1",
+    "ActiveTheme": "Light",
+    "ShowStepResultDetails": false
+  }
+}
\ No newline at end of file
diff --git a/QBFunctionTest/TestConfigs-example.xml b/QBFunctionTest/TestConfigs-example.xml
new file mode 100644
index 0000000..cc06398
--- /dev/null
+++ b/QBFunctionTest/TestConfigs-example.xml
@@ -0,0 +1,8 @@
+<Settings>
+    <setting name="qbUser" serializeAs="String">user@example.com</setting>
+    <setting name="qbPass" serializeAs="String">examplePassword</setting>
+    <setting name="qbAppToken" serializeAs="String">qbExampleAppToken</setting>
+    <setting name="qbSiteURL" serializeAs="String">example.quickbase.com</setting>
+    <setting name="qbAppDBID" serializeAs="String">exampleAppId</setting>
+    <setting name="qbBigTable" serializeAs="String">exampleTableId</setting>
+</Settings>
diff --git a/QBFunctionTest/UnitTest1.cs b/QBFunctionTest/UnitTest1.cs
new file mode 100644
index 0000000..77ffb27
--- /dev/null
+++ b/QBFunctionTest/UnitTest1.cs
@@ -0,0 +1,470 @@
+using System;
+using System.Collections.Generic;
+using System.Xml.Linq;
+using System.Linq;
+using Intuit.QuickBase.Client;
+using Intuit.QuickBase.Core;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace QBFunctionTest
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        private IQApplication qbApp = null;
+        private readonly Dictionary<string, string> qbSettings = new Dictionary<string, string>();
+
+
+        private void LoadSettings()
+        {
+            try
+            {
+                XDocument setDoc = XDocument.Load("TestConfigs.xml");
+                foreach (XElement xNod in setDoc.Root.Descendants())
+                {
+                    qbSettings.Add(xNod.Attribute("name").Value, xNod.Value);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                throw new ApplicationException("Can't load TestConfigs.xml file: " + ex.Message, ex);
+            }
+        }
+
+        public void InitConnection()
+        {
+            LoadSettings();
+            var client = QuickBase.Login(qbSettings["qbUser"], qbSettings["qbPass"], qbSettings["qbSiteURL"]);
+            qbApp = client.Connect(qbSettings["qbAppDBID"], qbSettings["qbAppToken"]);
+        }
+
+        public void InitConnection2()
+        {
+            LoadSettings();
+            var client = QuickBase.Login(qbSettings["qbUser"], qbSettings["qbPass"], qbSettings["qbSiteURL"]);
+            qbApp = client.Connect(qbSettings["qbAppDBID2"], qbSettings["qbAppToken"]);
+        }
+
+        public static readonly List<string> multiTextOptions = new List<string>
+        {
+            "Option1",
+            "Option2",
+            "Option3",
+            "Foop"
+        };
+
+        class TestRecord
+        {
+            public string textVal;
+            public decimal floatVal;
+            public bool checkboxVal;
+            public DateTime dateVal;
+            public DateTime timeStampVal;
+            public TimeSpan timeOfDayVal;
+            public decimal currencyVal;
+            public TimeSpan durationVal;
+            public string emailVal;
+            public string phoneVal;
+            public decimal percentVal;
+            public readonly HashSet<int> multiTextVal;
+            public float ratingVal;
+            public string urlVal;
+
+            public TestRecord()
+            {
+                multiTextVal = new HashSet<int>();
+            }
+
+            public void SetupTestValues()
+            {
+                textVal = "Test string #1";
+                floatVal = 3452.54m;
+                checkboxVal = true;
+                dateVal = new DateTime(2015, 04, 15);
+                timeStampVal = new DateTime(1970, 02, 28, 23, 55, 00, DateTimeKind.Local);
+                timeOfDayVal = new TimeSpan(0, 12, 34, 0);
+                durationVal = new TimeSpan(0, 4, 5, 6);
+                currencyVal = 50.50m;
+                emailVal = "test@example.com";
+                phoneVal = "(303) 555-1212";
+                percentVal = 95.5m;
+                urlVal = "http://www.example.com";
+                ratingVal = 4.5f;
+                multiTextVal.Add(2);
+                multiTextVal.Add(3);
+            }
+
+            public void Setup2ndValues()
+            {
+                textVal = "Test string #2 & \"an ampersand\".";
+                floatVal = 1234.56m;
+                checkboxVal = false;
+                dateVal = new DateTime(2010, 01, 12);
+                timeStampVal = new DateTime(1971, 03, 24, 23, 55, 11, DateTimeKind.Local);
+                timeOfDayVal = new TimeSpan(0, 23, 45, 0);
+                durationVal = new TimeSpan(1, 2, 3, 4);
+                currencyVal = 25.25m;
+                emailVal = "test2@sample.com";
+                phoneVal = "(719) 555-1212";
+                percentVal = 95.5m;
+                urlVal = "http://www.sample.com";
+                ratingVal = 3.0f;
+                multiTextVal.Add(1);
+            }
+        }
+
+        [TestMethod]
+        public void NewMultitextTest()
+        {
+            InitConnection2();
+            IQTable testTab = qbApp.GetTable(qbSettings["qbTestTable2"]);
+            testTab.Query();
+        }
+
+        [TestMethod]
+        public void UntestedTest()
+        {
+            InitConnection();
+            IQTable testTab = qbApp.GetTable("bpexujk45");
+            testTab.Query();
+            IQRecord rec = testTab.Records[0];
+            var richText = rec["RichText"];
+            var multiLine = rec["MultiLine"];
+            var multiChoice = rec["MultiChoice"];
+            var fileAttach = rec["FileAttachment"];
+            QAddress address = (QAddress)rec["Address"];
+            var userList = rec["ListUser"];
+            QAddress homeAddress = (QAddress)rec["HomeAddress"];
+        }
+
+        [TestMethod]
+        public void DeletionTest()
+        {
+            InitConnection();
+            List<GrantedAppsInfo> appsLst = qbApp.GrantedDBs();
+            foreach (var app in appsLst)
+            {
+                foreach (var tab in app.GrantedTables)
+                {
+                    if (tab.Name == "APITestApp: APIDelTestTable")
+                    {
+                        IQTable tbl = qbApp.GetTable(tab.Dbid);
+                        qbApp.DeleteTable(tbl);
+                        break;
+                    }
+                }
+            }
+            IQTable testTable = qbApp.NewTable("APIDelTestTable", "dummyRec");
+            testTable.Columns.Add(new QColumn("NumberValue", FieldType.@float));
+            testTable.Columns.Add(new QColumn("TextValue", FieldType.text));
+
+            IQRecord newRec = testTable.NewRecord();
+            newRec["NumberValue"] = 0;
+            newRec["TextValue"] = "Zeroeth";
+            testTable.Records.Add(newRec);
+            newRec = testTable.NewRecord();
+            newRec["NumberValue"] = 1;
+            newRec["TextValue"] = "First";
+            testTable.Records.Add(newRec);
+            newRec = testTable.NewRecord();
+            newRec["NumberValue"] = 2;
+            newRec["TextValue"] = "Second";
+            testTable.Records.Add(newRec);
+            newRec = testTable.NewRecord();
+            newRec["NumberValue"] = 3;
+            newRec["TextValue"] = "Third";
+            testTable.Records.Add(newRec);
+            newRec = testTable.NewRecord();
+            newRec["NumberValue"] = 4;
+            newRec["TextValue"] = "Fourth";
+            testTable.Records.Add(newRec);
+            newRec = testTable.NewRecord();
+            newRec["NumberValue"] = 5;
+            newRec["TextValue"] = "Fifth";
+            testTable.Records.Add(newRec);
+            newRec = testTable.NewRecord();
+            newRec["NumberValue"] = 6;
+            newRec["TextValue"] = "Sixth";
+            testTable.Records.Add(newRec);
+            newRec = testTable.NewRecord();
+            newRec["NumberValue"] = 7;
+            newRec["TextValue"] = "Seventh";
+            testTable.Records.Add(newRec);
+            newRec = testTable.NewRecord();
+            newRec["NumberValue"] = 8;
+            newRec["TextValue"] = "Eighth";
+            testTable.Records.Add(newRec);
+            newRec = testTable.NewRecord();
+            newRec["NumberValue"] = 9;
+            newRec["TextValue"] = "Ninth";
+            testTable.Records.Add(newRec);
+            newRec = testTable.NewRecord();
+            newRec["NumberValue"] = 10;
+            newRec["TextValue"] = "Tenth";
+            testTable.Records.Add(newRec);
+            testTable.AcceptChanges();
+
+            testTable.Records.RemoveAt(10);
+            testTable.Records.RemoveAt(8);
+            testTable.Records.RemoveAt(7);
+            testTable.Records.RemoveAt(6);
+            testTable.Records.RemoveAt(3);
+            testTable.Records.RemoveAt(1);
+            testTable.AcceptChanges();
+
+            testTable.Query();
+            Assert.AreEqual(testTable.Records.Count, 5, "Record deletion fails");
+        }
+
+        [TestMethod]
+        public void LargeDeleteHandling()
+        {
+            InitConnection();
+            List<GrantedAppsInfo> appsLst = qbApp.GrantedDBs();
+            foreach (var app in appsLst)
+            {
+                foreach (var tab in app.GrantedTables)
+                {
+                    if (tab.Name == "APITestApp: APIBigDelTestTable")
+                    {
+                        IQTable tbl = qbApp.GetTable(tab.Dbid);
+                        qbApp.DeleteTable(tbl);
+                        break;
+                    }
+                }
+            }
+            IQTable testTable = qbApp.NewTable("APIBigDelTestTable", "dummyRec");
+            testTable.Columns.Add(new QColumn("NumberValue", FieldType.@float));
+            testTable.Columns.Add(new QColumn("TextValue", FieldType.text));
+
+            for (int i = 1; i <= 500; i++)
+            {
+                IQRecord newRec = testTable.NewRecord();
+                newRec["NumberValue"] = i;
+                newRec["TextValue"] = "Record " + i;
+                testTable.Records.Add(newRec);
+            }
+            testTable.AcceptChanges();
+            testTable.Query();
+            Assert.AreEqual(500, testTable.Records.Count,"Big Record creation fails");
+
+            List<int> delList = new List<int>
+            {
+                5,
+                6,
+                7,
+                8,
+                9,
+                10
+            };
+            Random rndSrc = new Random();
+            while (delList.Count < 120)
+            {
+                int addVal = rndSrc.Next(1,500);
+                if (!delList.Contains(addVal)) delList.Add(addVal);
+            }
+            foreach (int i in delList)
+            {
+                testTable.Records.Remove(testTable.Records.Single(r => (decimal)r["NumberValue"] == i));
+            }
+            Assert.AreEqual(380, testTable.Records.Count, "Deletion process fail");
+            testTable.AcceptChanges();
+
+            testTable.Query();
+            Assert.AreEqual(380, testTable.Records.Count, "Big Record deletion fails");
+        }
+
+#if false           //Turning off this test as it requires external setup... will try to make a randomly generated huge table later
+        [TestMethod]
+        public void LargeTableHandling()
+        {
+            InitConnection();
+            IQTable orderTable = qbApp.GetTable(qbSettings["qbBigTable"]);
+            Query qry = new Query();
+            QueryStrings lstQry = new QueryStrings(1, ComparisonOperator.IR, "last 60 d",
+                LogicalOperator.NONE);
+            qry.Add(lstQry);
+            int maxRec = 100000;
+            orderTable.Query(qry, string.Format("skp-10.num-{0}", maxRec));
+            Assert.AreEqual(maxRec, orderTable.Records.Count);
+            HashSet<string> idLst = new HashSet<string>();
+            foreach (QRecord rec in orderTable.Records)
+            {
+                string id = (string)rec["Record ID#"];
+                if (idLst.Contains(id))
+                    Assert.Fail("Duplicate ID found!");
+                else
+                    idLst.Add(id);
+            }
+        }
+#endif
+
+        [TestMethod]
+        public void BasicTableOps()
+        {
+            InitConnection();
+            List<GrantedAppsInfo> appsLst = qbApp.GrantedDBs();
+            IQTable tbl = null;
+            foreach (var app in appsLst)
+            {
+                foreach (var tab in app.GrantedTables)
+                {
+                    if (tab.Name == "APITestApp: APITestTable")
+                    {
+                        tbl = qbApp.GetTable(tab.Dbid);
+                    }
+                }
+            }
+            Assert.IsNotNull(tbl,"Can't find table");
+            tbl.Query();
+            tbl.Records[0]["CheckboxTest"] = false;
+            tbl.AcceptChanges();
+        }
+
+        [TestMethod]
+        public void BasicCreationAndRoundTripTest()
+        {
+            InitConnection();
+            List<GrantedAppsInfo> appsLst = qbApp.GrantedDBs();
+            foreach (var app in appsLst)
+            {
+                foreach (var tab in app.GrantedTables)
+                {
+                    if (tab.Name == "APITestApp: APITestTable")
+                    {
+                        IQTable tbl = qbApp.GetTable(tab.Dbid);
+                        qbApp.DeleteTable(tbl);
+                        break;
+                    }
+                }
+            }
+
+            IQTable testTable = qbApp.NewTable("APITestTable", "dummyRec");
+            testTable.Columns.Add(new QColumn("TextTest", FieldType.text));
+            testTable.Columns.Add(new QColumn("FloatTest", FieldType.@float));
+            testTable.Columns.Add(new QColumn("CheckboxTest", FieldType.checkbox));
+            testTable.Columns.Add(new QColumn("DateTest", FieldType.date));
+            testTable.Columns.Add(new QColumn("TimeStampTest", FieldType.timestamp));
+            testTable.Columns.Add(new QColumn("TimeOfDayTest", FieldType.timeofday));
+            testTable.Columns.Add(new QColumn("DurationTest", FieldType.duration));
+            testTable.Columns.Add(new QColumn("CurrencyTest", FieldType.currency));
+            testTable.Columns.Add(new QColumn("PercentTest", FieldType.percent));
+            testTable.Columns.Add(new QColumn("EmailTest", FieldType.email));
+            testTable.Columns.Add(new QColumn("PhoneTest", FieldType.phone));
+            testTable.Columns.Add(new QColumn("UrlTest", FieldType.url));
+            testTable.Columns.Add(new QColumn("MultiTextTest", FieldType.multitext));
+            testTable.Columns.Add(new QColumn("RatingTest", FieldType.rating));
+            //testTable.Columns.Add(new QColumn("FileTest", FieldType.file));
+
+            foreach (string val in multiTextOptions)
+            {
+                testTable.Columns["MultiTextTest"].AddChoice(val);
+            }
+
+            TestRecord exemplar = new TestRecord();
+            exemplar.SetupTestValues();
+
+            IQRecord inRec = testTable.NewRecord();
+            inRec["TextTest"] = exemplar.textVal;
+            inRec["FloatTest"] = exemplar.floatVal;
+            inRec["CheckboxTest"] = exemplar.checkboxVal;
+            inRec["DateTest"] = exemplar.dateVal;
+            inRec["TimeStampTest"] = exemplar.timeStampVal;
+            inRec["TimeOfDayTest"] = exemplar.timeOfDayVal;
+            inRec["DurationTest"] = exemplar.durationVal;
+            inRec["CurrencyTest"] = exemplar.currencyVal;
+            inRec["PercentTest"] = exemplar.percentVal;
+            inRec["EmailTest"] = exemplar.emailVal;
+            inRec["PhoneTest"] = exemplar.phoneVal;
+            inRec["UrlTest"] = exemplar.urlVal;
+            inRec["MultiTextTest"] = exemplar.multiTextVal;
+            inRec["RatingTest"] = exemplar.ratingVal;
+
+            Assert.AreEqual(exemplar.textVal, inRec["TextTest"], "Strings setter fails");
+            Assert.AreEqual(exemplar.floatVal, inRec["FloatTest"], "Floats setter fails");
+            Assert.AreEqual(exemplar.checkboxVal, inRec["CheckboxTest"], "Checkboxes setter fails");
+            Assert.AreEqual(exemplar.dateVal, inRec["DateTest"], "Dates setter fails");
+            Assert.AreEqual(exemplar.timeStampVal, inRec["TimeStampTest"], "TimeStamps setter fails");
+            Assert.AreEqual(exemplar.timeOfDayVal, inRec["TimeOfDayTest"], "TimeOfDays setter fails");
+            Assert.AreEqual(exemplar.durationVal, inRec["DurationTest"], "Durations setter fails");
+            Assert.AreEqual(exemplar.currencyVal, inRec["CurrencyTest"], "Currency setter fails");
+            Assert.AreEqual(exemplar.percentVal, inRec["PercentTest"], "Percent setter fails");
+            Assert.AreEqual(exemplar.emailVal, inRec["EmailTest"], "Email setter fails");
+            Assert.AreEqual(exemplar.phoneVal, inRec["PhoneTest"], "Phone setter fails");
+            Assert.AreEqual(exemplar.urlVal, inRec["UrlTest"], "Url setter fails");
+            Assert.AreEqual(exemplar.multiTextVal, inRec["MultiTextTest"], "MultiTextSetter fails");
+            Assert.AreEqual(exemplar.ratingVal, inRec["RatingTest"], "RatingSetter fails");
+            testTable.Records.Add(inRec);
+            testTable.AcceptChanges();
+
+            Assert.AreEqual(exemplar.textVal, inRec["TextTest"], "Strings wrong post upload");
+            Assert.AreEqual(exemplar.floatVal, inRec["FloatTest"], "Floats wrong post upload");
+            Assert.AreEqual(exemplar.checkboxVal, inRec["CheckboxTest"], "Checkboxes wrong post upload");
+            Assert.AreEqual(exemplar.dateVal, inRec["DateTest"], "Dates wrong post upload");
+            Assert.AreEqual(exemplar.timeStampVal, inRec["TimeStampTest"], "TimeStamps wrong post upload");
+            Assert.AreEqual(exemplar.timeOfDayVal, inRec["TimeOfDayTest"], "TimeOfDays wrong post upload");
+            Assert.AreEqual(exemplar.durationVal, inRec["DurationTest"], "Durations wrong post upload");
+            Assert.AreEqual(exemplar.currencyVal, inRec["CurrencyTest"], "Currency wrong post upload");
+            Assert.AreEqual(exemplar.percentVal, inRec["PercentTest"], "Percent wrong post upload");
+            Assert.AreEqual(exemplar.emailVal, inRec["EmailTest"], "Email wrong post upload");
+            Assert.AreEqual(exemplar.phoneVal, inRec["PhoneTest"], "Phone wrong post upload");
+            Assert.AreEqual(exemplar.urlVal, inRec["UrlTest"], "Url wrong post upload");
+            Assert.IsTrue(exemplar.multiTextVal.SetEquals((HashSet<int>)inRec["MultiTextTest"]), "MultiText wrong post upload");
+            Assert.AreEqual(exemplar.ratingVal, inRec["RatingTest"], "Rating wrong post upload");
+            testTable.Records.Clear();
+            testTable.Query();
+
+            IQRecord outRec = testTable.Records[0];
+            Assert.AreEqual(exemplar.textVal, outRec["TextTest"], "Strings roundtrip fail");
+            Assert.AreEqual(exemplar.floatVal, outRec["FloatTest"], "Floats roundtrip fail");
+            Assert.AreEqual(exemplar.checkboxVal, outRec["CheckboxTest"], "Checkboxes roundtrip fail");
+            Assert.AreEqual(exemplar.dateVal, outRec["DateTest"], "Dates roundtrip fail");
+            Assert.AreEqual(exemplar.timeStampVal, outRec["TimeStampTest"], "TimeStamps roundtrip fail");
+            Assert.AreEqual(exemplar.timeOfDayVal, outRec["TimeOfDayTest"], "TimeOfDays roundtrip fail");
+            Assert.AreEqual(exemplar.durationVal, outRec["DurationTest"], "Durations roundtrip fail");
+            Assert.AreEqual(exemplar.currencyVal, outRec["CurrencyTest"], "Currencies roundtrip fail");
+            Assert.AreEqual(exemplar.percentVal, outRec["PercentTest"], "Percents roundtrip fail");
+            Assert.AreEqual(exemplar.emailVal, outRec["EmailTest"], "Emails roundtrip fail");
+            Assert.AreEqual(exemplar.phoneVal, outRec["PhoneTest"], "Phones roundtrip fail");
+            Assert.AreEqual(exemplar.urlVal, outRec["UrlTest"], "Url roundtrip fail");
+            Assert.IsTrue(exemplar.multiTextVal.SetEquals((HashSet<int>)outRec["MultiTextTest"]), "MultiText roundtrip fail");
+            Assert.AreEqual(exemplar.ratingVal, outRec["RatingTest"], "Rating roundtrip fail");
+
+            exemplar.Setup2ndValues();
+            outRec["TextTest"] = exemplar.textVal;
+            outRec["FloatTest"] = exemplar.floatVal;
+            outRec["CheckboxTest"] = exemplar.checkboxVal;
+            outRec["DateTest"] = exemplar.dateVal;
+            outRec["TimeStampTest"] = exemplar.timeStampVal;
+            outRec["TimeOfDayTest"] = exemplar.timeOfDayVal;
+            outRec["DurationTest"] = exemplar.durationVal;
+            outRec["CurrencyTest"] = exemplar.currencyVal;
+            outRec["PercentTest"] = exemplar.percentVal;
+            outRec["EmailTest"] = exemplar.emailVal;
+            outRec["PhoneTest"] = exemplar.phoneVal;
+            outRec["UrlTest"] = exemplar.urlVal;
+            outRec["MultiTextTest"] = exemplar.multiTextVal;
+            outRec["RatingTest"] = exemplar.ratingVal;
+
+            testTable.AcceptChanges();
+            testTable.Query();
+
+            IQRecord outRec2 = testTable.Records[0];
+            Assert.AreEqual(exemplar.textVal, outRec2["TextTest"], "Strings update fail");
+            Assert.AreEqual(exemplar.floatVal, outRec2["FloatTest"], "Floats update fail");
+            Assert.AreEqual(exemplar.checkboxVal, outRec2["CheckboxTest"], "Checkboxes update fail");
+            Assert.AreEqual(exemplar.dateVal, outRec2["DateTest"], "Dates update fail");
+            Assert.AreEqual(exemplar.timeStampVal, outRec2["TimeStampTest"], "TimeStamps update fail");
+            Assert.AreEqual(exemplar.timeOfDayVal, outRec2["TimeOfDayTest"], "TimeOfDays update fail");
+            Assert.AreEqual(exemplar.durationVal, outRec2["DurationTest"], "Durations update fail");
+            Assert.AreEqual(exemplar.currencyVal, outRec2["CurrencyTest"], "Currencies update fail");
+            Assert.AreEqual(exemplar.percentVal, outRec2["PercentTest"], "Percents update fail");
+            Assert.AreEqual(exemplar.emailVal, outRec2["EmailTest"], "Emails update fail");
+            Assert.AreEqual(exemplar.phoneVal, outRec2["PhoneTest"], "Phones update fail");
+            Assert.AreEqual(exemplar.urlVal, outRec2["UrlTest"], "Url update fail");
+            Assert.IsTrue(exemplar.multiTextVal.SetEquals((HashSet<int>)outRec2["MultiTextTest"]), "MultiText update fail");
+            Assert.AreEqual(exemplar.ratingVal, outRec2["RatingTest"], "Rating update fail");
+        }
+    }
+}
diff --git a/QBFunctionTest/app.config b/QBFunctionTest/app.config
new file mode 100644
index 0000000..b09e762
--- /dev/null
+++ b/QBFunctionTest/app.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <configSections>
+    </configSections>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/README.md b/README.md
index 51797f8..56d428b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
 QuickBase-C--SDK
 ================
 
-C# wrapper for Intuit QuickBase HTTP APIs 
\ No newline at end of file
+C# wrapper for Intuit QuickBase HTTP APIs
+
+In order to run the unit tests, you will need to copy QBFunctionTest/TestConfigs-example.xml to
+QBFunctionTest/TestConfigs.xml and put values for your site into it.
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..0824ae7
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,4 @@
+- Fix multiple blank line problems in text files (multiple /r/n get collapsed into one)
+- Alter the way that queries load data so that LoadColumns is never needed after the table instantiation
+- Implement option remove for rating and multiselect fields
+- more unit tests (this is complicated by the apparent limitation of not being able to create some field types from the API)