diff --git a/src/.idea/.idea.L5Sharp/.idea/workspace.xml b/src/.idea/.idea.L5Sharp/.idea/workspace.xml
index 049bc682..560a757e 100644
--- a/src/.idea/.idea.L5Sharp/.idea/workspace.xml
+++ b/src/.idea/.idea.L5Sharp/.idea/workspace.xml
@@ -8,32 +8,21 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="752cc344-96c2-4c02-b648-9fe9aa3d66f8" name="Changes" comment="updated gitignore">
-      <change afterPath="$PROJECT_DIR$/L5Sharp.Core/Enums/ComponentClass.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../tests/L5Sharp.AcdTest/AcdTesting.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../tests/L5Sharp.AcdTest/GlobalUsings.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../tests/L5Sharp.Tests/Components/TagTests.Class_SetValidValue_ShouldBeVerified.verified.xml" afterDir="false" />
+    <list default="true" id="752cc344-96c2-4c02-b648-9fe9aa3d66f8" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/L5Sharp.Core/Common/CodeKey.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.L5Sharp/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.L5Sharp/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/L5Sharp.Core/Components/AddOnInstruction.cs" beforeDir="false" afterPath="$PROJECT_DIR$/L5Sharp.Core/Components/AddOnInstruction.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/L5Sharp.Core/Components/Program.cs" beforeDir="false" afterPath="$PROJECT_DIR$/L5Sharp.Core/Components/Program.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/L5Sharp.Core/Components/Tag.cs" beforeDir="false" afterPath="$PROJECT_DIR$/L5Sharp.Core/Components/Tag.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/L5Sharp.Core/Components/Task.cs" beforeDir="false" afterPath="$PROJECT_DIR$/L5Sharp.Core/Components/Task.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/L5Sharp.Core/Elements/Rung.cs" beforeDir="false" afterPath="$PROJECT_DIR$/L5Sharp.Core/Elements/Rung.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/L5Sharp.Core/LogixComponent.cs" beforeDir="false" afterPath="$PROJECT_DIR$/L5Sharp.Core/LogixComponent.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/L5Sharp.Core/LogixElement.cs" beforeDir="false" afterPath="$PROJECT_DIR$/L5Sharp.Core/LogixElement.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/L5Sharp.Core/LogixType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/L5Sharp.Core/LogixType.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/L5Sharp.Core/Utilities/L5XExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/L5Sharp.Core/Utilities/L5XExtensions.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/L5Sharp.sln" beforeDir="false" afterPath="$PROJECT_DIR$/L5Sharp.sln" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../tests/L5Sharp.Tests/Components/RoutineTests.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../tests/L5Sharp.Tests/Components/RoutineTests.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../tests/L5Sharp.Tests/Components/TagTests.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../tests/L5Sharp.Tests/Components/TagTests.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../tests/L5Sharp.Tests/L5Sharp.Tests.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/../tests/L5Sharp.Tests/L5Sharp.Tests.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../tests/L5Sharp.Tests/LogixElementTests.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../tests/L5Sharp.Tests/LogixElementTests.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../tests/L5Sharp.Tests/ProofTesting.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../tests/L5Sharp.Tests/ProofTesting.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../tests/L5Sharp.Tests/Elements/RungTests.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../tests/L5Sharp.Tests/Elements/RungTests.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ChangesViewManager" show_ignored="true" />
   <component name="DisabledMethodsStorage">
     <option name="disabledMethods">
       <set>
@@ -53,7 +42,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$/.." value="main" />
+        <entry key="$PROJECT_DIR$/.." value="wip/logixobject" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
@@ -73,11 +62,12 @@
     <setting file="file://$USER_HOME$/AppData/Local/Symbols/src/dotnet/runtime/808851b07acfa1c5c94b0d4f9fb50debedb2df70/src/libraries/System.Private.CoreLib/src/System/Type.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$USER_HOME$/AppData/Local/Symbols/src/dotnet/runtime/a6dbb800a47735bde43187350fd3aff4071c7f9c/src/libraries/System.Linq.Expressions/src/System/Linq/Expressions/UnaryExpression.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$USER_HOME$/AppData/Local/Symbols/src/dotnet/runtime/a6dbb800a47735bde43187350fd3aff4071c7f9c/src/libraries/System.Private.CoreLib/src/System/String.Manipulation.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/7df3d9d25f5b442793953acc1eef7eaded8b0/c5/d069d260/Regex.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/889595c0c9f04f5199bbadadab8ed150b1d8a0/67/188d3af4/IParsable`1.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock://C:/Users/tnunnink/Documents/GitHub/L5Sharp/src/L5Sharp.Core/Components/AddOnInstruction.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock://C:/Users/tnunnink/Documents/GitHub/L5Sharp/src/L5Sharp.Core/Components/AddOnInstruction.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock://C:/Users/tnunnink/Documents/GitHub/L5Sharp/src/L5Sharp.Core/Components/AddOnInstruction.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/Users/tnunnink/Documents/GitHub/L5Sharp/src/L5Sharp.Core/LogixComponent.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/Users/tnunnink/Documents/GitHub/L5Sharp/src/L5Sharp.Core/LogixType.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/Users/tnunnink/Documents/GitHub/L5Sharp/src/L5Sharp.Core/LogixType.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/../tests/L5Sharp.Tests/Serialization/AddOnInstructionSerializerTests.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/../tests/L5Sharp.Tests/Serialization/DataTypeMemberSerializerTests.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/../tests/L5Sharp.Tests/obj/Debug/net7.0/Verify.Attributes.cs" root0="SKIP_HIGHLIGHTING" />
@@ -396,7 +386,13 @@
       <workItem from="1707874794656" duration="23844000" />
       <workItem from="1708611698515" duration="2484000" />
       <workItem from="1709828049288" duration="3716000" />
-      <workItem from="1709946015200" duration="1738000" />
+      <workItem from="1709946015200" duration="3182000" />
+      <workItem from="1710419985718" duration="4316000" />
+      <workItem from="1710512345641" duration="5697000" />
+      <workItem from="1710613336959" duration="1821000" />
+      <workItem from="1710700419465" duration="10352000" />
+      <workItem from="1711050419621" duration="1671000" />
+      <workItem from="1711122733101" duration="1219000" />
     </task>
     <task id="LOCAL-00199" summary="cleared warnings. preping to merge changes.">
       <created>1677621948966</created>
@@ -741,7 +737,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687451515386</updated>
     </task>
-    <option name="localTasksCounter" value="329" />
+    <option name="localTasksCounter" value="330" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -777,7 +773,6 @@
       <path value="$PROJECT_DIR$/../.." />
     </ignored-roots>
     <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
-    <MESSAGE value="Lots of addition to LogixCode.cs elements and referencing. Initial proof on concept is working well. Need to finish all internal indexing support and testing. Need to revisit NeutralText. Need to finish remaining routine content elements." />
     <MESSAGE value="Reorg and documentation of some classes. Finishing primary tasks for new referencing feature. Starting to revisit NeutralText." />
     <MESSAGE value="Starting updates for Instruction.cs. Added Argument.cs. Attempting to make instruction not a enum type but a common value type with arguments." />
     <MESSAGE value="FBD refinement. L5X API refinement. Documentations. Bug fixes. Other development" />
@@ -802,7 +797,8 @@
     <MESSAGE value="Fix the LogixParser.cs TryParse to return null instead of throwing exceptions for primitive types or unknown types." />
     <MESSAGE value="Update version" />
     <MESSAGE value="updated gitignore" />
-    <option name="LAST_COMMIT_MESSAGE" value="updated gitignore" />
+    <MESSAGE value="Added ComponentClass.cs. Working on adding IParse to components." />
+    <option name="LAST_COMMIT_MESSAGE" value="Added ComponentClass.cs. Working on adding IParse to components." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/src/L5Sharp.Core/Common/CodeKey.cs b/src/L5Sharp.Core/Common/CodeKey.cs
new file mode 100644
index 00000000..b7bd69aa
--- /dev/null
+++ b/src/L5Sharp.Core/Common/CodeKey.cs
@@ -0,0 +1,77 @@
+using System;
+
+namespace L5Sharp.Core;
+
+public readonly struct CodeKey : IEquatable<CodeKey>
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="container"></param>
+    /// <param name="routine"></param>
+    /// <param name="number"></param>
+    public CodeKey(string? container, string? routine, uint number)
+    {
+        Container = container ?? string.Empty;
+        Routine = routine ?? string.Empty;
+        Number = number;
+    }
+
+    /// <summary>
+    /// The containing program or instruction for the line of code within the project.
+    /// </summary>
+    /// <value>
+    /// A <see cref="string"/> representing the name of the containing program or instruction if attached.
+    /// If not attached to an L5X file, this will be an empty string.
+    /// </value>
+    public string Container { get; }
+
+    /// <summary>
+    /// The name of the routine containing the line of code within the project. 
+    /// </summary>
+    /// <value>
+    /// A <see cref="string"/> representing the name of the containing routine if attached.
+    /// If not attached to an L5X file, this will be an empty string.
+    /// </value>
+    public string Routine { get; }
+
+    /// <summary>
+    /// The number representing the rung, line, or sheet within the routine where the code exists.
+    /// </summary>
+    public uint Number { get; }
+
+
+    /// <inheritdoc />
+    public bool Equals(CodeKey other) =>
+        Container.IsEquivalent(other.Container) &&
+        Routine.IsEquivalent(other.Routine) &&
+        Number == other.Number;
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is CodeKey other && Equals(other);
+
+    /// <inheritdoc />
+    public override int GetHashCode() =>
+        StringComparer.OrdinalIgnoreCase.GetHashCode(Container) ^
+        StringComparer.OrdinalIgnoreCase.GetHashCode(Routine) ^
+        Number.GetHashCode();
+
+    /// <summary>
+    /// Determines if two objects are equal.
+    /// </summary>
+    /// <param name="left">The first object to compare.</param>
+    /// <param name="right">The second object to compare.</param>
+    /// <returns><c>true</c> if the objects have the same type and name property; Otherwise, <c>false</c>.</returns>
+    public static bool operator ==(CodeKey left, CodeKey right) => Equals(left, right);
+
+    /// <summary>
+    /// Determines if two objects are not equal.
+    /// </summary>
+    /// <param name="left">The first object to compare.</param>
+    /// <param name="right">The second object to compare.</param>
+    /// <returns><c>true</c> if the objects have the same type and name property; Otherwise, <c>false</c>.</returns>
+    public static bool operator !=(CodeKey left, CodeKey right) => !Equals(left, right);
+
+    /// <inheritdoc />
+    public override string ToString() => $"{Container}/{Routine}/{Number}";
+}
\ No newline at end of file
diff --git a/src/L5Sharp.Core/Elements/Rung.cs b/src/L5Sharp.Core/Elements/Rung.cs
index 55c28e5d..d220493a 100644
--- a/src/L5Sharp.Core/Elements/Rung.cs
+++ b/src/L5Sharp.Core/Elements/Rung.cs
@@ -70,7 +70,7 @@ public NeutralText Text
     public string? Comment
     {
         get => GetProperty<string>();
-        set => SetProperty(value);
+        set => SetFirstProperty(value);
     }
     
     /// <summary>
diff --git a/src/L5Sharp.Core/L5Sharp.Core.csproj b/src/L5Sharp.Core/L5Sharp.Core.csproj
index c9965db8..265efe48 100644
--- a/src/L5Sharp.Core/L5Sharp.Core.csproj
+++ b/src/L5Sharp.Core/L5Sharp.Core.csproj
@@ -7,9 +7,9 @@
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
         <Title>L5Sharp</Title>
         <Authors>Timothy Nunnink</Authors>
-        <Version>0.19.5</Version>
-        <AssemblyVersion>0.19.5</AssemblyVersion>
-        <FileVersion>0.19.5.0</FileVersion>
+        <Version>0.19.6</Version>
+        <AssemblyVersion>0.19.6</AssemblyVersion>
+        <FileVersion>0.19.6.0</FileVersion>
         <Description>A library for intuitively interacting with Rockwell's L5X import/export files.</Description>
         <RepositoryUrl>https://github.com/tnunnink/L5Sharp</RepositoryUrl>
         <PackageTags>csharp allen-bradely l5x logix plc-programming rockwell-automation logix5000</PackageTags>
@@ -17,7 +17,7 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <!--<PackageIcon>icon.png</PackageIcon>-->
         <RepositoryType>git</RepositoryType>
-        <PackageReleaseNotes>Added ComponentClass enum to component classes.</PackageReleaseNotes>
+        <PackageReleaseNotes>Fixed bug with Rung comment/text element order.</PackageReleaseNotes>
         <Copyright>Copyright (c) Timothy Nunnink 2022</Copyright>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageId>L5Sharp</PackageId>
diff --git a/src/L5Sharp.Core/LogixComponent.cs b/src/L5Sharp.Core/LogixComponent.cs
index 79afe196..e4579397 100644
--- a/src/L5Sharp.Core/LogixComponent.cs
+++ b/src/L5Sharp.Core/LogixComponent.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
 
diff --git a/src/L5Sharp.Core/LogixElement.cs b/src/L5Sharp.Core/LogixElement.cs
index 8ed9493b..ed34dfd3 100644
--- a/src/L5Sharp.Core/LogixElement.cs
+++ b/src/L5Sharp.Core/LogixElement.cs
@@ -703,6 +703,50 @@ protected void SetProperty<T>(T value, [CallerMemberName] string? name = null)
 
         element.ReplaceWith(new XElement(name, new XCData(property)));
     }
+    
+    /// <summary>
+    /// Adds, updates, or removes the first child element with the provided value type object.
+    /// </summary>
+    /// <param name="name">The name of the property element to add, update, or remove.</param>
+    /// <param name="value">The value to assign to the child element. The child element is removed if the value is null.
+    /// Otherwise, the value is converted to its string representation, wrapped in a <see cref="XCData"/> object,
+    /// and assigned to the Value property of the child element.</param>
+    /// <typeparam name="T">The value type.</typeparam>
+    /// <remarks>
+    /// <para>
+    /// This method will always set the first child element directly under the element for which it is called. This is
+    /// important for various element types as they need to ensure the the order of child elements or properties to
+    /// be correctly imported.
+    /// </para>
+    /// <para>
+    /// This method it only available to make getting/setting data on <see cref="Element"/> as concise
+    /// as possible from derived classes. This method uses the <see cref="CallerMemberNameAttribute"/> so the deriving
+    /// classes don't have to specify the property name (assuming its the name matches the underlying element property).
+    /// </para>
+    /// </remarks>
+    protected void SetFirstProperty<T>(T value, [CallerMemberName] string? name = null)
+    {
+        if (string.IsNullOrEmpty(name))
+            throw new ArgumentException("Name can not be null or empty", nameof(name));
+
+        var property = value?.ToString();
+        var element = Element.Element(name);
+
+        if (property is null)
+        {
+            element?.Remove();
+            return;
+        }
+
+        if (element is null)
+        {
+            Element.AddFirst(new XElement(name, new XCData(property)));
+            return;
+        }
+
+        element.ReplaceWith(new XElement(name, new XCData(property)));
+    }
+    
 
     /// <summary>
     /// Sets the complex type object of a child element, adds a child element, or removes a child element.
diff --git a/src/L5Sharp.Core/LogixType.cs b/src/L5Sharp.Core/LogixType.cs
index 38c16150..93ec336f 100644
--- a/src/L5Sharp.Core/LogixType.cs
+++ b/src/L5Sharp.Core/LogixType.cs
@@ -353,7 +353,7 @@ public static ArrayType<TLogixType> ToArrayType<TLogixType>(this IEnumerable<TLo
         if (array is null) throw new ArgumentNullException(nameof(array));
         var arrayType = typeof(ArrayType<>).MakeGenericType(typeof(TLogixType));
         var parameterType = typeof(TLogixType[]);
-        var constructor = arrayType.GetConstructor(new[] { parameterType })!;
+        var constructor = arrayType.GetConstructor([parameterType])!;
         var parameter = Expression.Parameter(parameterType, "array");
         var creator = Expression.New(constructor, parameter);
         var lambda = Expression.Lambda<Func<TLogixType[], ArrayType<TLogixType>>>(creator, parameter);
diff --git a/tests/L5Sharp.Tests/Components/TagTests.cs b/tests/L5Sharp.Tests/Components/TagTests.cs
index 5018c19b..1fc3de50 100644
--- a/tests/L5Sharp.Tests/Components/TagTests.cs
+++ b/tests/L5Sharp.Tests/Components/TagTests.cs
@@ -156,6 +156,19 @@ public void Parent_FromNestedDescendantMember_ShouldBeExpected()
         parent?.TagName.Should().Be("Test.Simple");
     }
 
+    [Test]
+    public void New_NamedComplexType_ShouldHaveExpectedDataTypeAndMembers()
+    {
+        var tag = new Tag { Name = "Test", Value = new ComplexType("MyCustomType") };
+        
+        tag.Add("Member01", new DINT(100));
+        tag.Add("Member02", new TIMER { PRE = 3000 });
+        tag.Add("Member03", new ComplexType("SubType"));
+
+        tag.DataType.Should().Be("MyCustomType");
+        tag.Members().Where(m => m.TagName.Depth == 1).Should().HaveCount(3);
+    }
+
     #endregion
 
     #region DeserializeTests
@@ -868,7 +881,7 @@ public Task ProduceInfo_SetNewValue_ShouldBeVerified()
 
         return VerifyXml(xml);
     }
-    
+
     [Test]
     public Task ConsumeInfo_SetNewValue_ShouldBeVerified()
     {
@@ -889,14 +902,14 @@ public Task ConsumeInfo_SetNewValue_ShouldBeVerified()
     }
 
     #endregion
-    
+
     [Test]
     public Task Class_SetValidValue_ShouldBeVerified()
     {
-        var tag = new Tag { Name = "Test", Class = ComponentClass.Safety, Value = 100};
+        var tag = new Tag { Name = "Test", Class = ComponentClass.Safety, Value = 100 };
 
         var xml = tag.Serialize().ToString();
 
-        return VerifyXml(xml); 
+        return VerifyXml(xml);
     }
 }
\ No newline at end of file
diff --git a/tests/L5Sharp.Tests/Elements/RungTests.New_Default_ShouldBeVerified.verified.xml b/tests/L5Sharp.Tests/Elements/RungTests.New_Default_ShouldBeVerified.verified.xml
new file mode 100644
index 00000000..4ae29ecb
--- /dev/null
+++ b/tests/L5Sharp.Tests/Elements/RungTests.New_Default_ShouldBeVerified.verified.xml
@@ -0,0 +1,3 @@
+<Rung Type="N">
+  <Text></Text>
+</Rung>
\ No newline at end of file
diff --git a/tests/L5Sharp.Tests/Elements/RungTests.New_TextOverload_ShouldBeVerified.verified.xml b/tests/L5Sharp.Tests/Elements/RungTests.New_TextOverload_ShouldBeVerified.verified.xml
new file mode 100644
index 00000000..c6098b0b
--- /dev/null
+++ b/tests/L5Sharp.Tests/Elements/RungTests.New_TextOverload_ShouldBeVerified.verified.xml
@@ -0,0 +1,3 @@
+<Rung Type="N">
+  <Text>XIC(MyTag)[OTE(SomeOutput)TMR(TimerTag,?,?)];</Text>
+</Rung>
\ No newline at end of file
diff --git a/tests/L5Sharp.Tests/Elements/RungTests.SetCommentThenText_ShouldBeValid.verified.xml b/tests/L5Sharp.Tests/Elements/RungTests.SetCommentThenText_ShouldBeValid.verified.xml
new file mode 100644
index 00000000..7e2706a3
--- /dev/null
+++ b/tests/L5Sharp.Tests/Elements/RungTests.SetCommentThenText_ShouldBeValid.verified.xml
@@ -0,0 +1,4 @@
+<Rung Type="N">
+  <Comment>This is a test comment</Comment>
+  <Text>AFI;</Text>
+</Rung>
\ No newline at end of file
diff --git a/tests/L5Sharp.Tests/Elements/RungTests.SetComment_DefaultRung_ShouldBeValid.verified.xml b/tests/L5Sharp.Tests/Elements/RungTests.SetComment_DefaultRung_ShouldBeValid.verified.xml
new file mode 100644
index 00000000..da6836b0
--- /dev/null
+++ b/tests/L5Sharp.Tests/Elements/RungTests.SetComment_DefaultRung_ShouldBeValid.verified.xml
@@ -0,0 +1,4 @@
+<Rung Type="N">
+  <Comment>This is a test comment</Comment>
+  <Text></Text>
+</Rung>
\ No newline at end of file
diff --git a/tests/L5Sharp.Tests/Elements/RungTests.SetTextToNullThenCommentThenTextAgainShouldBeValid.verified.xml b/tests/L5Sharp.Tests/Elements/RungTests.SetTextToNullThenCommentThenTextAgainShouldBeValid.verified.xml
new file mode 100644
index 00000000..7e2706a3
--- /dev/null
+++ b/tests/L5Sharp.Tests/Elements/RungTests.SetTextToNullThenCommentThenTextAgainShouldBeValid.verified.xml
@@ -0,0 +1,4 @@
+<Rung Type="N">
+  <Comment>This is a test comment</Comment>
+  <Text>AFI;</Text>
+</Rung>
\ No newline at end of file
diff --git a/tests/L5Sharp.Tests/Elements/RungTests.cs b/tests/L5Sharp.Tests/Elements/RungTests.cs
index 98a3b64a..a7aabef6 100644
--- a/tests/L5Sharp.Tests/Elements/RungTests.cs
+++ b/tests/L5Sharp.Tests/Elements/RungTests.cs
@@ -45,4 +45,53 @@ public void IsEquivalent_AreNotEqual_ShouldBeFalse()
 
         result.Should().BeFalse();
     }
+
+    [Test]
+    public Task New_Default_ShouldBeVerified()
+    {
+        var rung = new Rung();
+
+        return VerifyXml(rung.Serialize().ToString());
+    }
+    
+    [Test]
+    public Task New_TextOverload_ShouldBeVerified()
+    {
+        var rung = new Rung("XIC(MyTag)[OTE(SomeOutput)TMR(TimerTag,?,?)];");
+
+        return VerifyXml(rung.Serialize().ToString());
+    }
+
+    [Test]
+    public Task SetComment_DefaultRung_ShouldBeValid()
+    {
+        var rung = new Rung();
+
+        rung.Comment = "This is a test comment";
+
+        return VerifyXml(rung.Serialize().ToString());
+    }
+    
+    [Test]
+    public Task SetCommentThenText_ShouldBeValid()
+    {
+        var rung = new Rung();
+
+        rung.Comment = "This is a test comment";
+        rung.Text = "AFI;";
+
+        return VerifyXml(rung.Serialize().ToString());
+    }
+
+    [Test]
+    public Task SetTextToNullThenCommentThenTextAgainShouldBeValid()
+    {
+        var rung = new Rung();
+
+        rung.Text = null!;
+        rung.Comment = "This is a test comment";
+        rung.Text = "AFI;";
+
+        return VerifyXml(rung.Serialize().ToString());
+    }
 }
\ No newline at end of file
diff --git a/tests/L5Sharp.Tests/L5Sharp.Tests.csproj b/tests/L5Sharp.Tests/L5Sharp.Tests.csproj
index f19ec31f..fb400240 100644
--- a/tests/L5Sharp.Tests/L5Sharp.Tests.csproj
+++ b/tests/L5Sharp.Tests/L5Sharp.Tests.csproj
@@ -295,6 +295,9 @@
       <None Update="Components\TagTests.Class_SetValidValue_ShouldBeVerified.verified.xml">
         <DependentUpon>TagTests.cs</DependentUpon>
       </None>
+      <None Update="Elements\RungTests.SetTextToNullThenCommentThenTextAgainShouldBeValid.verified.xml">
+        <DependentUpon>RungTests.cs</DependentUpon>
+      </None>
     </ItemGroup>
 
     <ItemGroup>