From 1f06feb7bd8e47bd75a9ba6538bf9caad097e506 Mon Sep 17 00:00:00 2001
From: Kevin Day <Kevin@kevux.org>
Date: Sun, 25 Aug 2024 17:07:47 -0500
Subject: [PATCH] Progress: Continue working on getting FSS Embedded Read
 working and also add Object close support.

This starts the work for the handling of the depths.
I noticed the tests now pass despite the depths being incomplete.
Looks like I need to add some runtime tests for depths for both 0.6 and 0.7.

This brings in the runtime test expects from the 0.6 branch.

I have some brain storming to do so that I can determine how I want to handle the depth processing logic.

I decided that now is a good time to add support for the Object close.
This is to address the problem where I cannot print the original Object close for FSS Extended List and FSS Embedded List.
The reason being that the necessary data is not actually recorded.
I have not yet updated the unit tests.
I have not yet did any actual tests to confirm that this works.
I have not yet actually utilized this in the FSS Extended List Read and FSS Embedded List Read programs.
I have only made the low level changes and made sure everything compiles.
---
 level_0/f_fss/c/fss/item.h                         | 13 +++--
 level_1/fl_fss/c/fss/basic.h                       | 20 ++++++++
 level_1/fl_fss/c/fss/basic_list.h                  | 22 +++++++++
 level_1/fl_fss/c/fss/embedded_list.c               |  8 ++--
 level_1/fl_fss/c/fss/embedded_list.h               | 24 +++++++++-
 level_1/fl_fss/c/fss/extended.h                    | 20 ++++++++
 level_1/fl_fss/c/fss/extended_list.c               | 22 +++++----
 level_1/fl_fss/c/fss/extended_list.h               | 30 +++++++++++-
 level_1/fl_fss/c/fss/private-payload-helper.h      | 12 +++++
 level_1/fl_fss/c/fss/private-payload.h             | 55 ++++++++++++++++++++--
 level_2/fll_fss/c/fss/basic.h                      | 11 +++++
 level_2/fll_fss/c/fss/basic_list.h                 | 15 +++++-
 level_2/fll_fss/c/fss/embedded_list.c              |  2 +-
 level_2/fll_fss/c/fss/embedded_list.h              | 11 ++++-
 level_2/fll_fss/c/fss/extended.h                   | 11 +++++
 level_2/fll_fss/c/fss/extended_list.c              | 11 +++--
 level_2/fll_fss/c/fss/extended_list.h              | 21 ++++++++-
 level_2/fll_fss/c/fss/payload.h                    | 13 +++++
 level_3/fss_read/c/embedded_list/fss_read.c        | 10 +---
 level_3/fss_read/c/embedded_list/process_normal.c  | 44 ++++++++++++-----
 level_3/fss_read/c/extended_list/fss_read.c        |  2 +-
 level_3/fss_read/c/main/common.c                   |  4 ++
 level_3/fss_read/c/main/common/define.h            |  2 +
 level_3/fss_read/c/main/common/type.c              |  1 +
 level_3/fss_read/c/main/common/type.h              | 11 ++++-
 level_3/fss_read/c/main/fss_read.c                 |  2 +-
 level_3/fss_read/c/main/process_normal.c           | 21 ++++-----
 .../test-0000-basic-content-columns-empty.expect   | 12 +----
 .../expect/test-0000-basic-content-columns.expect  | 12 +----
 ...-0000-basic-content-name--select-1-total.expect |  1 +
 ...-0000-basic-content-name-a-columns-empty.expect |  4 +-
 .../test-0000-basic-content-name-a-columns.expect  |  4 +-
 ...0000-basic-content-name-a-select-1-total.expect |  1 +
 ...00-basic-content-name-a-select-100-total.expect |  1 +
 ...0000-basic-content-name-a-select-2-total.expect |  1 +
 ...0000-basic-content-name-a-select-5-total.expect |  1 +
 ...0000-basic-content-name-a-select-6-total.expect |  1 +
 ...sic-content-name-hi-select-1-empty-total.expect |  1 +
 ...000-basic-content-name-hi-select-1-total.expect |  1 +
 ...asic-content-name-payload-select-1-total.expect |  1 +
 ...\320\274\320\270\321\200-select-1-total.expect" |  1 +
 ...20\265\321\202_has_space-select-1-total.expect" |  1 +
 .../expect/test-0000-basic-object-columns.expect   | 14 +-----
 .../expect/test-0000-basic-object-line-0.expect    | 12 -----
 .../expect/test-0000-basic-object-line-1.expect    | 12 -----
 .../expect/test-0000-basic-object-line-100.expect  | 13 -----
 .../expect/test-0000-basic-object-line-5.expect    | 12 -----
 .../expect/test-0000-basic-object-line-6.expect    | 12 -----
 ...t-0000-basic-object-name--select-1-total.expect |  1 +
 ...t-0000-basic-object-name-a-columns-empty.expect |  3 +-
 .../test-0000-basic-object-name-a-columns.expect   |  3 +-
 ...-0000-basic-object-name-a-select-1-total.expect |  1 +
 ...000-basic-object-name-a-select-100-total.expect |  1 +
 ...-0000-basic-object-name-a-select-2-total.expect |  1 +
 ...-0000-basic-object-name-a-select-5-total.expect |  1 +
 ...-0000-basic-object-name-a-select-6-total.expect |  1 +
 ...asic-object-name-hi-select-1-empty-total.expect |  1 +
 ...0000-basic-object-name-hi-select-1-total.expect |  1 +
 ...basic-object-name-payload-select-1-total.expect |  1 +
 ...\320\274\320\270\321\200-select-1-total.expect" |  1 +
 ...20\265\321\202_has_space-select-1-total.expect" |  1 +
 ...0-basic-object_and_content-columns-empty.expect | 38 +--------------
 ...st-0000-basic-object_and_content-columns.expect | 38 +--------------
 ...est-0000-basic-object_and_content-line-0.expect | 36 --------------
 ...est-0000-basic-object_and_content-line-1.expect | 36 --------------
 ...t-0000-basic-object_and_content-line-100.expect | 37 ---------------
 ...est-0000-basic-object_and_content-line-5.expect | 36 --------------
 ...est-0000-basic-object_and_content-line-6.expect | 36 --------------
 ...-object_and_content-name--select-1-total.expect |  1 +
 ...-object_and_content-name-a-columns-empty.expect |  8 +---
 ...-basic-object_and_content-name-a-columns.expect |  8 +---
 ...object_and_content-name-a-select-0-total.expect |  2 +-
 ...object_and_content-name-a-select-1-total.expect |  1 +
 ...ject_and_content-name-a-select-100-total.expect |  1 +
 ...object_and_content-name-a-select-2-total.expect |  1 +
 ...object_and_content-name-a-select-5-total.expect |  1 +
 ...object_and_content-name-a-select-6-total.expect |  1 +
 ...00-basic-object_and_content-name-a-total.expect |  2 +-
 ...and_content-name-hi-select-1-empty-total.expect |  1 +
 ...bject_and_content-name-hi-select-1-total.expect |  1 +
 ..._and_content-name-payload-select-1-total.expect |  1 +
 ...\320\274\320\270\321\200-select-1-total.expect" |  1 +
 ...20\265\321\202_has_space-select-0-total.expect" |  2 +-
 ...20\265\321\202_has_space-select-1-total.expect" |  1 +
 ...320\262\320\265\321\202_has_space-total.expect" |  2 +-
 ...test-0000-basic-object_and_content-total.expect |  2 +-
 ...est-0001-empty_name_list-content-columns.expect |  4 +-
 ...y_name_list-content-name--select-1-total.expect |  1 +
 ...y_name_list-content-name-a-columns-empty.expect |  1 +
 ...1-empty_name_list-content-name-a-columns.expect |  2 +-
 ..._name_list-content-name-a-select-1-total.expect |  1 +
 ...ame_list-content-name-a-select-100-total.expect |  1 +
 ..._name_list-content-name-a-select-2-total.expect |  1 +
 ..._name_list-content-name-a-select-5-total.expect |  1 +
 ..._name_list-content-name-a-select-6-total.expect |  1 +
 ...ist-content-name-hi-select-1-empty-total.expect |  1 +
 ...name_list-content-name-hi-select-1-total.expect |  1 +
 ...list-content-name-payload-select-1-total.expect |  1 +
 ...\320\274\320\270\321\200-select-1-total.expect" |  1 +
 ...20\265\321\202_has_space-select-1-total.expect" |  1 +
 ...test-0001-empty_name_list-object-columns.expect |  8 +---
 .../test-0001-empty_name_list-object-line-0.expect |  6 ---
 .../test-0001-empty_name_list-object-line-1.expect |  6 ---
 ...est-0001-empty_name_list-object-line-100.expect |  7 ---
 .../test-0001-empty_name_list-object-line-5.expect |  6 ---
 .../test-0001-empty_name_list-object-line-6.expect |  6 ---
 ...ty_name_list-object-name--select-1-total.expect |  1 +
 ...ty_name_list-object-name-a-columns-empty.expect |  3 +-
 ...01-empty_name_list-object-name-a-columns.expect |  3 +-
 ...y_name_list-object-name-a-select-1-total.expect |  1 +
 ...name_list-object-name-a-select-100-total.expect |  1 +
 ...y_name_list-object-name-a-select-2-total.expect |  1 +
 ...y_name_list-object-name-a-select-5-total.expect |  1 +
 ...y_name_list-object-name-a-select-6-total.expect |  1 +
 ...list-object-name-hi-select-1-empty-total.expect |  1 +
 ..._name_list-object-name-hi-select-1-total.expect |  1 +
 ..._list-object-name-payload-select-1-total.expect |  1 +
 ...\320\274\320\270\321\200-select-1-total.expect" |  1 +
 ...20\265\321\202_has_space-select-1-total.expect" |  1 +
 ...me_list-object_and_content-columns-empty.expect | 18 +------
 ...pty_name_list-object_and_content-columns.expect | 18 +------
 ...mpty_name_list-object_and_content-line-0.expect | 16 -------
 ...mpty_name_list-object_and_content-line-1.expect | 16 -------
 ...ty_name_list-object_and_content-line-100.expect | 17 -------
 ...mpty_name_list-object_and_content-line-5.expect | 16 -------
 ...mpty_name_list-object_and_content-line-6.expect | 16 -------
 ...-object_and_content-name--select-0-total.expect |  2 +-
 ...-object_and_content-name--select-1-total.expect |  1 +
 ...name_list-object_and_content-name--total.expect |  2 +-
 ...-object_and_content-name-a-columns-empty.expect |  5 +-
 ...e_list-object_and_content-name-a-columns.expect |  5 +-
 ...object_and_content-name-a-select-0-total.expect |  2 +-
 ...object_and_content-name-a-select-1-total.expect |  1 +
 ...ject_and_content-name-a-select-100-total.expect |  1 +
 ...object_and_content-name-a-select-2-total.expect |  1 +
 ...object_and_content-name-a-select-5-total.expect |  1 +
 ...object_and_content-name-a-select-6-total.expect |  1 +
 ...ame_list-object_and_content-name-a-total.expect |  2 +-
 ...and_content-name-hi-select-0-empty-total.expect |  2 +-
 ...bject_and_content-name-hi-select-0-total.expect |  2 +-
 ...and_content-name-hi-select-1-empty-total.expect |  1 +
 ...bject_and_content-name-hi-select-1-total.expect |  1 +
 ...me_list-object_and_content-name-hi-total.expect |  2 +-
 ..._and_content-name-payload-select-1-total.expect |  1 +
 ...\320\274\320\270\321\200-select-1-total.expect" |  1 +
 ...20\265\321\202_has_space-select-1-total.expect" |  1 +
 ...empty_name_list-object_and_content-total.expect |  2 +-
 .../test-0002-mixed-content-columns-empty.expect   | 21 +--------
 .../expect/test-0002-mixed-content-columns.expect  | 21 +--------
 ...-0002-mixed-content-name-a-columns-empty.expect | 11 +----
 .../test-0002-mixed-content-name-a-columns.expect  | 11 +----
 ...0002-mixed-content-name-a-select-0-total.expect |  2 +-
 ...20\265\321\202_has_space-select-0-total.expect" |  2 +-
 ...\262\320\265\321\202_has_space-select-0.expect" |  1 -
 ...320\262\320\265\321\202_has_space-total.expect" |  2 +-
 ...0\270\320\262\320\265\321\202_has_space.expect" |  1 -
 .../expect/test-0002-mixed-content-original.expect |  1 -
 ...est-0002-mixed-content-select-0-original.expect |  1 -
 .../expect/test-0002-mixed-content-select-0.expect |  1 -
 .../expect/test-0002-mixed-content-total.expect    |  2 +-
 .../expect/test-0002-mixed-content-trim.expect     |  1 -
 .../fss_0008/expect/test-0002-mixed-content.expect |  1 -
 .../expect/test-0002-mixed-object-columns.expect   |  8 +---
 .../expect/test-0002-mixed-object-line-0.expect    |  6 ---
 .../expect/test-0002-mixed-object-line-1.expect    |  6 ---
 .../expect/test-0002-mixed-object-line-100.expect  |  7 ---
 .../expect/test-0002-mixed-object-line-5.expect    |  6 ---
 .../expect/test-0002-mixed-object-line-6.expect    |  6 ---
 ...t-0002-mixed-object-name--select-1-total.expect |  1 +
 ...t-0002-mixed-object-name-a-columns-empty.expect |  3 +-
 .../test-0002-mixed-object-name-a-columns.expect   |  3 +-
 ...-0002-mixed-object-name-a-select-1-total.expect |  1 +
 ...002-mixed-object-name-a-select-100-total.expect |  1 +
 ...-0002-mixed-object-name-a-select-2-total.expect |  1 +
 ...-0002-mixed-object-name-a-select-5-total.expect |  1 +
 ...-0002-mixed-object-name-a-select-6-total.expect |  1 +
 ...ixed-object-name-hi-select-1-empty-total.expect |  1 +
 ...0002-mixed-object-name-hi-select-1-total.expect |  1 +
 ...mixed-object-name-payload-select-1-total.expect |  1 +
 ...\320\274\320\270\321\200-select-1-total.expect" |  1 +
 ...20\265\321\202_has_space-select-1-total.expect" |  1 +
 ...2-mixed-object_and_content-columns-empty.expect | 35 +-------------
 ...st-0002-mixed-object_and_content-columns.expect | 35 +-------------
 ...est-0002-mixed-object_and_content-line-0.expect | 33 -------------
 ...est-0002-mixed-object_and_content-line-1.expect | 33 -------------
 ...t-0002-mixed-object_and_content-line-100.expect | 34 -------------
 ...est-0002-mixed-object_and_content-line-5.expect | 35 +-------------
 ...est-0002-mixed-object_and_content-line-6.expect | 33 -------------
 ...-object_and_content-name--select-1-total.expect |  1 +
 ...-object_and_content-name-a-columns-empty.expect | 15 +-----
 ...-mixed-object_and_content-name-a-columns.expect | 15 +-----
 ...object_and_content-name-a-select-0-total.expect |  2 +-
 ...object_and_content-name-a-select-1-total.expect |  1 +
 ...ject_and_content-name-a-select-100-total.expect |  1 +
 ...object_and_content-name-a-select-2-total.expect |  1 +
 ...object_and_content-name-a-select-5-total.expect |  1 +
 ...object_and_content-name-a-select-6-total.expect |  1 +
 ...02-mixed-object_and_content-name-a-total.expect |  2 +-
 ...and_content-name-hi-select-0-empty-total.expect |  2 +-
 ...bject_and_content-name-hi-select-0-total.expect |  2 +-
 ...and_content-name-hi-select-1-empty-total.expect |  1 +
 ...bject_and_content-name-hi-select-1-total.expect |  1 +
 ...2-mixed-object_and_content-name-hi-total.expect |  2 +-
 ..._and_content-name-payload-select-1-total.expect |  1 +
 ...\320\274\320\270\321\200-select-1-total.expect" |  1 +
 ...20\265\321\202_has_space-select-0-total.expect" |  2 +-
 ...\262\320\265\321\202_has_space-select-0.expect" |  1 -
 ...20\265\321\202_has_space-select-1-total.expect" |  1 +
 ...320\262\320\265\321\202_has_space-total.expect" |  2 +-
 ...t-0002-mixed-object_and_content-original.expect |  1 -
 ...t-0002-mixed-object_and_content-select-0.expect |  1 -
 ...test-0002-mixed-object_and_content-total.expect |  2 +-
 .../test-0002-mixed-object_and_content-trim.expect |  1 -
 .../test-0002-mixed-object_and_content.expect      |  1 -
 214 files changed, 493 insertions(+), 1017 deletions(-)

diff --git a/level_0/f_fss/c/fss/item.h b/level_0/f_fss/c/fss/item.h
index 6620cdd..3bd8c73 100644
--- a/level_0/f_fss/c/fss/item.h
+++ b/level_0/f_fss/c/fss/item.h
@@ -28,24 +28,27 @@ extern "C" {
  * Any resizing must be manually performed on each applicable property.
  *
  * Properties:
- *   - object:  The object.
- *   - content: The content associated with the object.
- *   - parent:  A location referencing a parrent object or content that this object content is nested under.
+ *   - object:  The Object.
+ *   - close:   The range representing where the Object closes for standards that require closing characters (such as after the Content).
+ *   - content: The Content associated with the Object.
+ *   - parent:  A location referencing a parrent Object or Content that this Object Content is nested under.
  */
 #ifndef _di_f_fss_item_t_
   typedef struct {
     f_range_t object;
+    f_range_t close;
     f_ranges_t content;
 
     f_number_unsigned_t parent;
   } f_fss_item_t;
 
-  #define f_fss_item_t_initialize { f_range_t_initialize, f_ranges_t_initialize, 0 }
+  #define f_fss_item_t_initialize { f_range_t_initialize, f_range_t_initialize, f_ranges_t_initialize, 0 }
 
-  #define macro_f_fss_item_t_initialize_1(object, content, parent) macro_f_number_unsigneds_t_initialize_1(object, content, parent)
+  #define macro_f_fss_item_t_initialize_1(object, close, content, parent) macro_f_number_unsigneds_t_initialize_1(object, close, content, parent)
 
   #define macro_f_fss_item_t_clear(item) \
     macro_f_range_t_clear(item.object); \
+    macro_f_range_t_clear(item.close); \
     macro_f_ranges_t_clear(item.content); \
     item.parent = 0;
 #endif // _di_f_fss_item_t_
diff --git a/level_1/fl_fss/c/fss/basic.h b/level_1/fl_fss/c/fss/basic.h
index ea3e74e..7d50ae2 100644
--- a/level_1/fl_fss/c/fss/basic.h
+++ b/level_1/fl_fss/c/fss/basic.h
@@ -41,10 +41,16 @@ extern "C" {
  *   The start location will be updated as the buffer is being processed.
  *   The start location will represent where the read stopped on return.
  *   A start location past the stop location or buffer used means that the entire range was processed.
+ *
+ *   Must not be NULL.
  * @param found
  *   A set of all locations where a valid content was found.
+ *
+ *   Must not be NULL.
  * @param delimits
  *   A delimits array representing where delimits exist within the buffer.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -103,8 +109,12 @@ extern "C" {
  *   If f_fss_complete_full_e, this will write any appropriate open and close aspects of this content, including the final newline.
  * @param range
  *   The start/stop location within the content string to write as an content.
+ *
+ *   Must not be NULL.
  * @param destination
  *   The buffer where the content is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -152,14 +162,20 @@ extern "C" {
  *   The start location will be updated as the buffer is being processed.
  *   The start location will represent where the read stopped on return.
  *   A start location past the stop location or buffer used means that the entire range was processed.
+ *
+ *   Must not be NULL.
  * @param found
  *   A location where a valid object was found.
+ *
+ *   Must not be NULL.
  * @param quote
  *   (optional) This will store the quote type representing the character to use (from the f_fss_quote_type_*_e).
  *
  *   Set to NULL to not use.
  * @param delimits
  *   A delimits array representing where delimits exist within the buffer.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -231,8 +247,12 @@ extern "C" {
  *   If f_fss_complete_partial_trim, this will write any appropriate open and close aspects of this object, but will omit whitespace before and after the object (inside the quotes).
  * @param range
  *   The start/stop location within the object string to write as an object.
+ *
+ *   Must not be NULL.
  * @param destination
  *   The buffer where the object is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
diff --git a/level_1/fl_fss/c/fss/basic_list.h b/level_1/fl_fss/c/fss/basic_list.h
index 892978d..d26f88a 100644
--- a/level_1/fl_fss/c/fss/basic_list.h
+++ b/level_1/fl_fss/c/fss/basic_list.h
@@ -41,14 +41,22 @@ extern "C" {
  *   The start location will be updated as the buffer is being processed.
  *   The start location will represent where the read stopped on return.
  *   A start location past the stop location or buffer used means that the entire range was processed.
+ *
+ *   Must not be NULL.
  * @param found
  *   A set of all locations where a valid content was found.
+ *
+ *   Must not be NULL.
  * @param delimits
  *   A delimits array representing where delimits exist within the buffer.
+ *
+ *   Must not be NULL.
  * @param comments
  *   An array of ranges representing where comments are found within any valid content.
  *   This only stores comments found within valid content only.
  *   The comment range will include the trailing newline.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -116,8 +124,12 @@ extern "C" {
  *   Set to NULL to not use.
  * @param range
  *   The start/stop location within the content string to write as an content.
+ *
+ *   Must not be NULL.
  * @param destination
  *   The buffer where the content is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -174,10 +186,16 @@ extern "C" {
  *   The start location will be updated as the buffer is being processed.
  *   The start location will represent where the read stopped on return.
  *   A start location past the stop location or buffer used means that the entire range was processed.
+ *
+ *   Must not be NULL.
  * @param found
  *   A location where a valid object was found.
+ *
+ *   Must not be NULL.
  * @param delimits
  *   A delimits array representing where delimits exist within the buffer.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -245,8 +263,12 @@ extern "C" {
  *   If f_fss_complete_partial_tim, this will write any appropriate open and close aspects of this object, but will omit whitespace before and after the object.
  * @param range
  *   The start/stop location within the object string to write as an object.
+ *
+ *   Must not be NULL.
  * @param destination
  *   The buffer where the object is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
diff --git a/level_1/fl_fss/c/fss/embedded_list.c b/level_1/fl_fss/c/fss/embedded_list.c
index ca20a75..e001f6e 100644
--- a/level_1/fl_fss/c/fss/embedded_list.c
+++ b/level_1/fl_fss/c/fss/embedded_list.c
@@ -19,8 +19,7 @@ extern "C" {
 
     f_fss_skip_past_delimit(buffer, range, state);
     if (F_status_is_error(state->status)) return;
-    if (state->status == F_data_not) return;
-    if (state->status == F_okay_eos || state->status == F_okay_stop) return;
+    if (state->status == F_data_not || state->status == F_okay_eos || state->status == F_okay_stop) return;
 
     fl_fss_data_embedded_list_t * const cache = (fl_fss_data_embedded_list_t *) state->data;
 
@@ -37,7 +36,7 @@ extern "C" {
     state->status = f_memory_array_increase(state->step_small, sizeof(f_fss_nest_t), (void **) &found->depth, &found->used, &found->size);
     if (F_status_is_error(state->status)) return;
 
-    state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &cache->objects->array, &cache->objects->used, &cache->objects->size);
+    state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &cache->objects->array, &cache->objects->used, &cache->objects->size);
     if (F_status_is_error(state->status)) return;
 
     state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &cache->positions->array, &cache->positions->used, &cache->positions->size);
@@ -603,6 +602,9 @@ extern "C" {
             delimits->array[delimits->used++] = comment_delimit;
           }
 
+          found->depth[depth].array[position].close.start = line_start;
+          found->depth[depth].array[position].close.stop = range->start - 1;
+
           newline_last = range->start;
           line_start = range->start + 1;
           graph_first = 0x1;
diff --git a/level_1/fl_fss/c/fss/embedded_list.h b/level_1/fl_fss/c/fss/embedded_list.h
index f1077bc..58dd6a0 100644
--- a/level_1/fl_fss/c/fss/embedded_list.h
+++ b/level_1/fl_fss/c/fss/embedded_list.h
@@ -48,7 +48,7 @@ extern "C" {
 
   #define fl_fss_data_embedded_list_t_initialize { 0, 0, 0 }
 
-  #define macro_fl_fss_data_embedded_list_t_initialize_1(objects, positions, slashes) { objects, positions, slashes }
+  #define macro_fl_fss_data_embedded_list_t_initialize_1(objects, closes, positions, slashes) { objects, positions, slashes }
 
   #define macro_fl_fss_data_embedded_list_t_clear(data) \
     data.objects = 0; \
@@ -72,14 +72,22 @@ extern "C" {
  *   The start location will be updated as the buffer is being processed.
  *   The start location will represent where the read stopped on return.
  *   A start location past the stop location or buffer used means that the entire range was processed.
+ *
+ *   Must not be NULL.
  * @param found
  *   A set of all locations where a valid content was found.
+ *
+ *   Must not be NULL.
  * @param delimits
  *   A delimits array representing where delimits exist within the buffer.
+ *
+ *   Must not be NULL.
  * @param comments
  *   An array of ranges representing where comments are found within any valid content.
  *   This only stores comments found within valid content only.
  *   The comment range will include the trailing newline.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -155,8 +163,12 @@ extern "C" {
  *   Set to NULL to not use.
  * @param range
  *   The start/stop location within the content string to write as an content.
+ *
+ *   Must not be NULL.
  * @param destination
  *   The buffer where the content is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -212,10 +224,16 @@ extern "C" {
  *   The start location will be updated as the buffer is being processed.
  *   The start location will represent where the read stopped on return.
  *   A start location past the stop location or buffer used means that the entire range was processed.
+ *
+ *   Must not be NULL.
  * @param found
  *   A location where a valid object was found.
+ *
+ *   Must not be NULL.
  * @param delimits
  *   A delimits array representing where delimits exist within the buffer.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -283,8 +301,12 @@ extern "C" {
  *   If f_fss_complete_partial_tim, this will write any appropriate open and close aspects of this object, but will omit whitespace before and after the object.
  * @param range
  *   The start/stop location within the object string to write as an object.
+ *
+ *   Must not be NULL.
  * @param destination
  *   The buffer where the object is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
diff --git a/level_1/fl_fss/c/fss/extended.h b/level_1/fl_fss/c/fss/extended.h
index 0251e85..14fcbb0 100644
--- a/level_1/fl_fss/c/fss/extended.h
+++ b/level_1/fl_fss/c/fss/extended.h
@@ -41,8 +41,12 @@ extern "C" {
  *   The start location will be updated as the buffer is being processed.
  *   The start location will represent where the read stopped on return.
  *   A start location past the stop location or buffer used means that the entire range was processed.
+ *
+ *   Must not be NULL.
  * @param found
  *   A set of all locations where a valid content was found.
+ *
+ *   Must not be NULL.
  * @param quotes
  *   (optional) This will store the quote type representing the character to use (from the f_fss_quote_type_*_e).
  *   Each index in quotes represents a position within the found array index.
@@ -50,6 +54,8 @@ extern "C" {
  *   Set to NULL to not use.
  * @param delimits
  *   A delimits array representing where delimits exist within the buffer.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -121,8 +127,12 @@ extern "C" {
  *   If f_fss_complete_full_e, this will write any appropriate open and close aspects of this content, including the final newline.
  * @param range
  *   The start/stop location within the content string to write as an content.
+ *
+ *   Must not be NULL.
  * @param destination
  *   The buffer where the content is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -180,14 +190,20 @@ extern "C" {
  *   The start location will be updated as the buffer is being processed.
  *   The start location will represent where the read stopped on return.
  *   A start location past the stop location or buffer used means that the entire range was processed.
+ *
+ *   Must not be NULL.
  * @param found
  *   A location where a valid object was found.
+ *
+ *   Must not be NULL.
  * @param quote
  *   (optional) This will store the quote type representing the character to use (from the f_fss_quote_type_*_e).
  *
  *   Set to NULL to not use.
  * @param delimits
  *   A delimits array representing where delimits exist within the buffer.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -258,8 +274,12 @@ extern "C" {
  *   If f_fss_complete_partial_e, this will write any appropriate open and close aspects of this object.
  * @param range
  *   The start/stop location within the object string to write as an object.
+ *
+ *   Must not be NULL.
  * @param destination
  *   The buffer where the object is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
diff --git a/level_1/fl_fss/c/fss/extended_list.c b/level_1/fl_fss/c/fss/extended_list.c
index 3c0e393..58fb27d 100644
--- a/level_1/fl_fss/c/fss/extended_list.c
+++ b/level_1/fl_fss/c/fss/extended_list.c
@@ -6,11 +6,11 @@ extern "C" {
 #endif
 
 #ifndef _di_fl_fss_extended_list_content_read_
-  void fl_fss_extended_list_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_number_unsigneds_t * const delimits, f_ranges_t * const comments, f_state_t * const state) {
+  void fl_fss_extended_list_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_range_t * const close, f_number_unsigneds_t * const delimits, f_ranges_t * const comments, f_state_t * const state) {
     #ifndef _di_level_1_parameter_checking_
       if (!state) return;
 
-      if (!range || !found || !delimits || !comments) {
+      if (!range || !found || !close || !delimits || !comments) {
         state->status = F_status_set_error(F_parameter);
 
         return;
@@ -48,7 +48,7 @@ extern "C" {
     f_number_unsigned_t newline_last = range->start;
     f_number_unsigned_t slash_first = 0;
     f_number_unsigned_t slash_count = 0;
-    f_number_unsigned_t start = 0;
+    f_number_unsigned_t line_start = 0;
 
     // Identify where the content ends.
     while (range->start <= range->stop && range->start < buffer.used) {
@@ -63,6 +63,7 @@ extern "C" {
 
       if (state->status == F_okay_eol) {
         newline_last = range->start++;
+        line_start = range->start;
 
         continue;
       }
@@ -165,6 +166,9 @@ extern "C" {
 
         // Found a valid content close, set stop point to last newline.
         if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
+          close->start = line_start;
+          close->stop = range->start - 1;
+
           ++range->start;
 
           // If the last newline is the entire start, then there is no Content.
@@ -189,12 +193,7 @@ extern "C" {
       if (buffer.string[range->start] == f_fss_comment_s.string[0]) {
 
         // The newline_last is initialized to the range->start, which may not actually be a new line.
-        if (buffer.string[newline_last] == f_string_eol_s.string[0]) {
-          start = newline_last + 1;
-        }
-        else {
-          start = newline_last;
-        }
+        line_start = (buffer.string[newline_last] == f_string_eol_s.string[0]) ? newline_last + 1 : newline_last;
 
         f_fss_seek_to_eol(buffer, range, state);
         if (F_status_is_error(state->status)) break;
@@ -209,9 +208,12 @@ extern "C" {
           newline_last = range->start;
         }
 
-        comments->array[comments->used].start = start;
+        comments->array[comments->used].start = line_start;
         comments->array[comments->used++].stop = range->start++;
 
+        // The newline_last is initialized to the range->start, which may not actually be a new line.
+        line_start = (buffer.string[newline_last] == f_string_eol_s.string[0]) ? newline_last + 1 : newline_last;
+
         continue;
       }
 
diff --git a/level_1/fl_fss/c/fss/extended_list.h b/level_1/fl_fss/c/fss/extended_list.h
index a6e9468..3a8e5f9 100644
--- a/level_1/fl_fss/c/fss/extended_list.h
+++ b/level_1/fl_fss/c/fss/extended_list.h
@@ -43,14 +43,26 @@ extern "C" {
  *   The start location will be updated as the buffer is being processed.
  *   The start location will represent where the read stopped on return.
  *   A start location past the stop location or buffer used means that the entire range was processed.
+ *
+ *   Must not be NULL.
  * @param found
  *   A set of all locations where a valid content was found.
+ *
+ *   Must not be NULL.
+ * @param close
+ *   A location where a valid Object close is found.
+ *
+ *   Must not be NULL.
  * @param delimits
  *   A delimits array representing where delimits exist within the buffer.
+ *
+ *   Must not be NULL.
  * @param comments
  *   An array of ranges representing where comments are found within any valid content.
  *   This only stores comments found within valid content only.
  *   The comment range will include the trailing newline.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -92,7 +104,7 @@ extern "C" {
  * @see f_utf_buffer_increment()
  */
 #ifndef _di_fl_fss_extended_list_content_read_
-  extern void fl_fss_extended_list_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_number_unsigneds_t * const delimits, f_ranges_t * const comments, f_state_t * const state);
+  extern void fl_fss_extended_list_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_range_t * const close, f_number_unsigneds_t * const delimits, f_ranges_t * const comments, f_state_t * const state);
 #endif // _di_fl_fss_extended_list_content_read_
 
 /**
@@ -124,8 +136,12 @@ extern "C" {
  *   Set to NULL to not use.
  * @param range
  *   The start/stop location within the content string to write as an content.
+ *
+ *   Must not be NULL.
  * @param destination
  *   The buffer where the content is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -181,10 +197,16 @@ extern "C" {
  *   The start location will be updated as the buffer is being processed.
  *   The start location will represent where the read stopped on return.
  *   A start location past the stop location or buffer used means that the entire range was processed.
+ *
+ *   Must not be NULL.
  * @param found
- *   A location where a valid object was found.
+ *   A location where a valid Object is found.
+ *
+ *   Must not be NULL.
  * @param delimits
  *   A delimits array representing where delimits exist within the buffer.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -252,8 +274,12 @@ extern "C" {
  *   If f_fss_complete_partial_tim, this will write any appropriate open and close aspects of this object, but will omit whitespace before and after the object.
  * @param range
  *   The start/stop location within the object string to write as an object.
+ *
+ *   Must not be NULL.
  * @param destination
  *   The buffer where the object is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
diff --git a/level_1/fl_fss/c/fss/private-payload-helper.h b/level_1/fl_fss/c/fss/private-payload-helper.h
index bb5fa65..64eb631 100644
--- a/level_1/fl_fss/c/fss/private-payload-helper.h
+++ b/level_1/fl_fss/c/fss/private-payload-helper.h
@@ -20,6 +20,7 @@ extern "C" {
  *
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -34,9 +35,11 @@ extern "C" {
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
  *   The internal.range is modified.
+ *
  *   Must not be NULL.
  * @param buffer
  *   The buffer to write using the FLL Extended (FSS-0001) format.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -57,6 +60,7 @@ extern "C" {
  *
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -72,9 +76,11 @@ extern "C" {
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
  *   The internal.range is modified.
+ *
  *   Must not be NULL.
  * @param buffer
  *   The buffer to write using the FLL Extended (FSS-0001) format.
+ *
  *   Must not be NULL.
  * @param append_on_empty
  *   Append the quoted empty string when the this flag is set.
@@ -98,6 +104,7 @@ extern "C" {
  *
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -113,9 +120,11 @@ extern "C" {
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
  *   The internal.range is modified.
+ *
  *   Must not be NULL.
  * @param destination
  *   The buffer to append to.
+ *
  *   Must not be NULL.
  * @param separator
  *   The separate to use between each quoted empty string.
@@ -139,6 +148,7 @@ extern "C" {
  *
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -154,9 +164,11 @@ extern "C" {
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
  *   The internal.range is modified.
+ *
  *   Must not be NULL.
  * @param destination
  *   The buffer to append to.
+ *
  *   Must not be NULL.
  * @param separator
  *   The separate to use between each quoted empty string.
diff --git a/level_1/fl_fss/c/fss/private-payload.h b/level_1/fl_fss/c/fss/private-payload.h
index dacfd2a..7eeca90 100644
--- a/level_1/fl_fss/c/fss/private-payload.h
+++ b/level_1/fl_fss/c/fss/private-payload.h
@@ -25,6 +25,7 @@ extern "C" {
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
  *   This modifies data.cache.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -42,14 +43,17 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param buffers
  *   The array of dynamic strings to read from.
+ *
  *   Must not be NULL.
  * @param destinations
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -76,6 +80,7 @@ extern "C" {
  *
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -90,14 +95,17 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param map
  *   The map to read from.
+ *
  *   Must not be NULL.
  * @param destinations
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -123,6 +131,7 @@ extern "C" {
  *
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -137,14 +146,17 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param map
  *   The map to read from.
+ *
  *   Must not be NULL.
  * @param destinations
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -170,6 +182,7 @@ extern "C" {
  *
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -184,14 +197,17 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param maps
  *   The maps to read from.
+ *
  *   Must not be NULL.
  * @param destinations
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -217,6 +233,7 @@ extern "C" {
  *
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -231,14 +248,17 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param maps
  *   The maps to read from.
+ *
  *   Must not be NULL.
  * @param destinations
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -268,6 +288,7 @@ extern "C" {
  *   The fl_fss_payload_header_state_t pointer.
  *   This caller must reset data.cache.used as needed.
  *   If data.cache.used is not 0, then this will append a space before adding the converted number.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -281,9 +302,11 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param number
  *   The signed number.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -323,9 +346,11 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param number
  *   The unsigned number.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -351,6 +376,7 @@ extern "C" {
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
  *   This modifies data.cache.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -367,6 +393,7 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param quantity
  *   The quantity to process.
@@ -374,6 +401,7 @@ extern "C" {
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -403,6 +431,7 @@ extern "C" {
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
  *   This modifies data.cache.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -419,13 +448,15 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
- * @param quantity
- *   The quantity to process.
+ * @param quantitys
+ *   The quantitys to process.
  * @param destinations
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -455,6 +486,7 @@ extern "C" {
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
  *   This modifies data.cache.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -471,6 +503,7 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param range
  *   The range to process.
@@ -478,6 +511,7 @@ extern "C" {
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -507,6 +541,7 @@ extern "C" {
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
  *   This modifies data.cache.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -523,6 +558,7 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param range
  *   The range to process.
@@ -530,6 +566,7 @@ extern "C" {
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -559,6 +596,7 @@ extern "C" {
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
  *   This modifies data.cache.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -575,14 +613,17 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param buffers
  *   The array of NULL terminated strings to read from.
+ *
  *   Must not be NULL.
  * @param destinations
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -612,6 +653,7 @@ extern "C" {
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
  *   This modifies data.cache.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -628,6 +670,7 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
  * @param triple
  *   The triple to process.
@@ -635,6 +678,7 @@ extern "C" {
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
@@ -664,6 +708,7 @@ extern "C" {
  * @param data
  *   The fl_fss_payload_header_state_t pointer.
  *   This modifies data.cache.
+ *
  *   Must not be NULL.
  * @param state
  *   The state passed directly from the fl_fss_payload_header_map() parameters.
@@ -680,13 +725,15 @@ extern "C" {
  *   Must not be NULL.
  * @param internal
  *   The internal state, fl_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *
  *   Must not be NULL.
- * @param triple
- *   The triple to process.
+ * @param triples
+ *   The triples to process.
  * @param destinations
  *   A map of strings representing the header names and values after being safely converted into the valid payload header format.
  *   This built header names and values are appended onto this.
  *   This is updated as appropriate.
+ *
  *   Must not be NULL.
  *
  * @return
diff --git a/level_2/fll_fss/c/fss/basic.h b/level_2/fll_fss/c/fss/basic.h
index 0c066b5..fc15569 100644
--- a/level_2/fll_fss/c/fss/basic.h
+++ b/level_2/fll_fss/c/fss/basic.h
@@ -33,10 +33,16 @@ extern "C" {
  *   The buffer to read from.
  * @param range
  *   The range within the buffer that is currently being read.
+ *
+ *   Must not be NULL.
  * @param objects
  *   This will be populated with all valid objects found.
+ *
+ *   Must not be NULL.
  * @param contents
  *   This will be populated with all valid contents found.
+ *
+ *   Must not be NULL.
  * @param objects_quoted
  *   (optional) An array mapped to each object in objects representing the quote type discovered (from the f_fss_quote_type_*_e), if any.
  *
@@ -44,9 +50,12 @@ extern "C" {
  * @param objects_delimits
  *   An array of delimits for objects detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
+ *   Must not be NULL.
  * @param contents_delimits
  *   (optional) An array of delimits for contents detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
  *   Set to NULL and all delimits will instead utilize objects_delimits.
  * @param state
  A state for providing flags and handling interrupts during long running operations.
@@ -94,6 +103,8 @@ extern "C" {
  *   Otherwise, this is quote character to wrap the object in when writing.
  * @param destination
  *   The buffer where the content is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
diff --git a/level_2/fll_fss/c/fss/basic_list.h b/level_2/fll_fss/c/fss/basic_list.h
index fecbb9f..de826b6 100644
--- a/level_2/fll_fss/c/fss/basic_list.h
+++ b/level_2/fll_fss/c/fss/basic_list.h
@@ -33,20 +33,31 @@ extern "C" {
  *   The buffer to read from.
  * @param range
  *   The range within the buffer that is currently being read.
+ *
+ *   Must not be NULL.
  * @param objects
  *   This will be populated with all valid objects found.
+ *
+ *   Must not be NULL.
  * @param contents
  *   This will be populated with all valid contents found.
+ *
+ *   Must not be NULL.
  * @param objects_delimits
  *   An array of delimits for objects detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
+ *   Must not be NULL.
  * @param contents_delimits
  *   (optional) An array of delimits for contents detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
  *   Set to NULL and all delimits will instead utilize objects_delimits.
  * @param comments
  *   An array of ranges representing where comments are found within any valid content.
  *   This only stores comments found within valid content only.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -93,6 +104,8 @@ extern "C" {
  *   Set to NULL to not use.
  * @param destination
  *   The buffer to write to.
+ *
+ *   Must not be NULL.
  * @param state
  A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -122,7 +135,7 @@ extern "C" {
  * @see fl_fss_basic_list_object_write()
  */
 #ifndef _di_fll_fss_basic_list_write_
-  extern void fll_fss_basic_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, f_string_dynamic_t * const destination, f_state_t * const state);
+  extern void fll_fss_basic_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t * const content_prepend, f_string_dynamic_t * const destination, f_state_t * const state);
 #endif // _di_fll_fss_basic_list_write_
 
 #ifdef __cplusplus
diff --git a/level_2/fll_fss/c/fss/embedded_list.c b/level_2/fll_fss/c/fss/embedded_list.c
index a679617..f795fe4 100644
--- a/level_2/fll_fss/c/fss/embedded_list.c
+++ b/level_2/fll_fss/c/fss/embedded_list.c
@@ -117,7 +117,7 @@ extern "C" {
 #endif // _di_fll_fss_embedded_list_read_
 
 #ifndef _di_fll_fss_embedded_list_write_
-  void fll_fss_embedded_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state) {
+  void fll_fss_embedded_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t * const content_prepend, const f_ranges_t * const ignore, f_string_dynamic_t * const destination, f_state_t * const state) {
     #ifndef _di_level_2_parameter_checking_
       if (!state) return;
     #endif // _di_level_2_parameter_checking_
diff --git a/level_2/fll_fss/c/fss/embedded_list.h b/level_2/fll_fss/c/fss/embedded_list.h
index b1b83b5..0daeebf 100644
--- a/level_2/fll_fss/c/fss/embedded_list.h
+++ b/level_2/fll_fss/c/fss/embedded_list.h
@@ -35,16 +35,23 @@ extern "C" {
  *   The range within the buffer that is currently being read.
  * @param nest
  *   An nested set of all objects and content.
+ *
+ *   Must not be NULL.
  * @param objects_delimits
  *   An array of delimits for objects detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
+ *   Must not be NULL.
  * @param contents_delimits
  *   (optional) An array of delimits for contents detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
  *   Set to NULL and all delimits will instead utilize objects_delimits.
  * @param comments
  *   An array of ranges representing where comments are found within any valid content.
  *   This only stores comments found within valid content only.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -101,6 +108,8 @@ extern "C" {
  *   Set to NULL to not use.
  * @param destination
  *   The buffer where the content is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -130,7 +139,7 @@ extern "C" {
  * @see fl_fss_embedded_list_object_write()
  */
 #ifndef _di_fll_fss_embedded_list_write_
-  extern void fll_fss_embedded_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state);
+  extern void fll_fss_embedded_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t * const content_prepend, const f_ranges_t * const ignore, f_string_dynamic_t * const destination, f_state_t * const state);
 #endif // _di_fll_fss_embedded_list_write_
 
 #ifdef __cplusplus
diff --git a/level_2/fll_fss/c/fss/extended.h b/level_2/fll_fss/c/fss/extended.h
index 56e78bb..eea3b73 100644
--- a/level_2/fll_fss/c/fss/extended.h
+++ b/level_2/fll_fss/c/fss/extended.h
@@ -33,10 +33,16 @@ extern "C" {
  *   The buffer to read from.
  * @param range
  *   The range within the buffer that is currently being read.
+ *
+ *   Must not be NULL.
  * @param objects
  *   This will be populated with all valid objects found.
+ *
+ *   Must not be NULL.
  * @param contents
  *   This will be populated with all valid contents found.
+ *
+ *   Must not be NULL.
  * @param objects_quoted
  *   (optional) An array mapped to each object in objects representing the quote type discovered (from the f_fss_quote_type_*_e), if any.
  *
@@ -48,9 +54,12 @@ extern "C" {
  * @param objects_delimits
  *   An array of delimits for objects detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
+ *   Must not be NULL.
  * @param contents_delimits
  *   (optional) An array of delimits for contents detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
  *   Set to NULL and all delimits will instead utilize objects_delimits.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
@@ -98,6 +107,8 @@ extern "C" {
  *   Otherwise, this is quote character to wrap the object in when writing.
  * @param destination
  *   The buffer where the content is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
diff --git a/level_2/fll_fss/c/fss/extended_list.c b/level_2/fll_fss/c/fss/extended_list.c
index c28d302..5ef33a9 100644
--- a/level_2/fll_fss/c/fss/extended_list.c
+++ b/level_2/fll_fss/c/fss/extended_list.c
@@ -5,11 +5,11 @@ extern "C" {
 #endif
 
 #ifndef _di_fll_fss_extended_list_read_
-  void fll_fss_extended_list_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state) {
+  void fll_fss_extended_list_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_ranges_t * const closes, f_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state) {
     #ifndef _di_level_2_parameter_checking_
       if (!state) return;
 
-      if (!range || !objects || !contents) {
+      if (!range || !objects || !closes || !contents) {
         state->status = F_status_set_error(F_parameter);
 
         return;
@@ -25,6 +25,9 @@ extern "C" {
       state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &objects->array, &objects->used, &objects->size);
       if (F_status_is_error(state->status)) return;
 
+      state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &closes->array, &closes->used, &closes->size);
+      if (F_status_is_error(state->status)) return;
+
       state->status = f_memory_array_increase(state->step_small, sizeof(f_ranges_t), (void **) &contents->array, &contents->used, &contents->size);
       if (F_status_is_error(state->status)) return;
 
@@ -57,7 +60,7 @@ extern "C" {
           found_data = F_true;
           contents->array[contents->used].used = 0;
 
-          fl_fss_extended_list_content_read(buffer, range, &contents->array[contents->used], contents_delimits ? contents_delimits : objects_delimits, comments, state);
+          fl_fss_extended_list_content_read(buffer, range, &contents->array[contents->used], &closes->array[closes->used], contents_delimits ? contents_delimits : objects_delimits, comments, state);
           if (F_status_is_error(state->status)) return;
 
           break;
@@ -125,7 +128,7 @@ extern "C" {
 #endif // _di_fll_fss_extended_list_read_
 
 #ifndef _di_fll_fss_extended_list_write_
-  void fll_fss_extended_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state) {
+  void fll_fss_extended_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t * const content_prepend, const f_ranges_t * const ignore, f_string_dynamic_t * const destination, f_state_t * const state) {
     #ifndef _di_level_2_parameter_checking_
       if (!state) return;
     #endif // _di_level_2_parameter_checking_
diff --git a/level_2/fll_fss/c/fss/extended_list.h b/level_2/fll_fss/c/fss/extended_list.h
index 81afd10..e1f2fa4 100644
--- a/level_2/fll_fss/c/fss/extended_list.h
+++ b/level_2/fll_fss/c/fss/extended_list.h
@@ -35,20 +35,35 @@ extern "C" {
  *   The buffer to read from.
  * @param range
  *   The range within the buffer that is currently being read.
+ *
+ *   Must not be NULL.
  * @param objects
  *   This will be populated with all valid objects found.
+ *
+ *   Must not be NULL.
+ * @param closes
+ *   This will be populated with all close location of found Objects.
+ *
+ *   Must not be NULL.
  * @param contents
  *   This will be populated with all valid contents found.
+ *
+ *   Must not be NULL.
  * @param objects_delimits
  *   An array of delimits for objects detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
+ *   Must not be NULL.
  * @param contents_delimits
  *   (optional) An array of delimits for contents detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
  *   Set to NULL 0 and all delimits will instead utilize objects_delimits.
  * @param comments
  *   An array of ranges representing where comments are found within any valid content.
  *   This only stores comments found within valid content only.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -81,7 +96,7 @@ extern "C" {
  * @see fl_fss_extended_list_object_read()
  */
 #ifndef _di_fll_fss_extended_list_read_
-  extern void fll_fss_extended_list_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state);
+  extern void fll_fss_extended_list_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_ranges_t * const closes, f_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state);
 #endif // _di_fll_fss_extended_list_read_
 
 /**
@@ -103,6 +118,8 @@ extern "C" {
  *   Set to NULL to not use.
  * @param destination
  *   The buffer where the content is written to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -132,7 +149,7 @@ extern "C" {
  * @see fl_fss_extended_list_object_write()
  */
 #ifndef _di_fll_fss_extended_list_write_
-  extern void fll_fss_extended_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state);
+  extern void fll_fss_extended_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t * const content_prepend, const f_ranges_t * const ignore, f_string_dynamic_t * const destination, f_state_t * const state);
 #endif // _di_fll_fss_extended_list_write_
 
 #ifdef __cplusplus
diff --git a/level_2/fll_fss/c/fss/payload.h b/level_2/fll_fss/c/fss/payload.h
index 0118f7b..ec199dc 100644
--- a/level_2/fll_fss/c/fss/payload.h
+++ b/level_2/fll_fss/c/fss/payload.h
@@ -39,20 +39,31 @@ extern "C" {
  *   The buffer to read from.
  * @param range
  *   The range within the buffer that is currently being read.
+ *
+ *   Must not be NULL.
  * @param objects
  *   This will be populated with all valid objects found.
+ *
+ *   Must not be NULL.
  * @param contents
  *   This will be populated with all valid contents found.
+ *
+ *   Must not be NULL.
  * @param objects_delimits
  *   An array of delimits for objects detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
+ *   Must not be NULL.
  * @param contents_delimits
  *   (optional) An array of delimits for contents detected during processing.
  *   The caller is expected to decide if and when to process them.
+ *
  *   Set to NULL and all delimits will instead utilize objects_delimits.
  * @param comments
  *   An array of ranges representing where comments are found within any valid content.
  *   This only stores comments found within valid content only.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
@@ -118,6 +129,8 @@ extern "C" {
  *   Set to NULL to not use.
  * @param destination
  *   The buffer to append to.
+ *
+ *   Must not be NULL.
  * @param state
  *   A state for providing flags and handling interrupts during long running operations.
  *   There is no state.handle().
diff --git a/level_3/fss_read/c/embedded_list/fss_read.c b/level_3/fss_read/c/embedded_list/fss_read.c
index 77f488c..8d532e6 100644
--- a/level_3/fss_read/c/embedded_list/fss_read.c
+++ b/level_3/fss_read/c/embedded_list/fss_read.c
@@ -23,7 +23,7 @@ extern "C" {
 
     {
       f_state_t state = main->setting.state;
-      fl_fss_data_embedded_list_t cache = macro_fl_fss_data_embedded_list_t_initialize_1(&main->cache.objects, &main->cache.positions, &main->cache.slashes);
+      fl_fss_data_embedded_list_t cache = macro_fl_fss_data_embedded_list_t_initialize_1(&main->cache.objects, &main->cache.closes, &main->cache.positions, &main->cache.slashes);
 
       state.data = (void *) &cache;
 
@@ -56,14 +56,6 @@ extern "C" {
       }
     }
 
-    fss_read_ensure_quotes_length(main);
-
-    if (F_status_is_error(main->setting.state.status)) {
-      fss_read_print_error(&main->program.error, macro_fss_read_f(fss_read_ensure_quotes_length));
-
-      return;
-    }
-
     main->setting.state.status = F_okay;
   }
 #endif // _di_fss_read_embedded_list_process_load_
diff --git a/level_3/fss_read/c/embedded_list/process_normal.c b/level_3/fss_read/c/embedded_list/process_normal.c
index ecdf545..34f8e89 100644
--- a/level_3/fss_read/c/embedded_list/process_normal.c
+++ b/level_3/fss_read/c/embedded_list/process_normal.c
@@ -112,33 +112,49 @@ extern "C" {
   void fss_read_embedded_list_process_normal_determine_depth(fss_read_main_t * const main) {
 
     if (!main) return;
+    if (!main->setting.nest.used || !main->setting.nest.depth[0].used || !main->setting.depths.used) return;
+
+    f_number_unsigned_t depth = main->setting.depths.array[0].depth;
+
+    if (depth >= main->setting.nest.used) {
+      main->setting.state.status = F_status_set_error(F_parameter);
 
-    if (main->setting.flag & fss_read_main_flag_depth_d) {
-      // @todo determine depth and dynamically construct the objects and therefore content based on any of --at, --depth, and --name.
       return;
     }
 
-    if (!main->setting.nest.used || !main->setting.nest.depth[0].used) return;
+    if ((main->setting.flag & fss_read_main_flag_depth_d) && main->setting.nest.used > 1) {
+      f_number_unsigned_t i = 0;
 
-    main->setting.objects.used = 0;
-    main->setting.contents.used = 0;
+      // @todo make an array of depths based on size.
+      // @todo determine which ones have --at or --name used for them.
+
+      //if (main->setting.nest.depth[depth].array[main->setting.objects.used].content.used) {
 
-    main->setting.state.status = f_memory_array_resize(main->setting.nest.depth[0].used, sizeof(f_range_t), (void **) &main->setting.objects.array, &main->setting.objects.used, &main->setting.objects.size);
+      //main->setting.depth
+      //main->setting.nest.depth
+
+      //for (; i < main->setting.objects.used; ++i) {
+      //} // for
+
+      // @todo determine depth and dynamically construct the objects and therefore content based on any of --at, --depth, and --name.
+      return;
+    }
+
+    main->setting.state.status = f_memory_array_resize(main->setting.nest.depth[depth].used, sizeof(f_range_t), (void **) &main->setting.objects.array, &main->setting.objects.used, &main->setting.objects.size);
     if (F_status_is_error(main->setting.state.status)) return;
 
-    main->setting.state.status = f_memory_array_resize(main->setting.nest.depth[0].used, sizeof(f_ranges_t), (void **) &main->setting.contents.array, &main->setting.contents.used, &main->setting.contents.size);
+    main->setting.state.status = f_memory_array_resize(main->setting.nest.depth[depth].used, sizeof(f_ranges_t), (void **) &main->setting.contents.array, &main->setting.contents.used, &main->setting.contents.size);
     if (F_status_is_error(main->setting.state.status)) return;
 
-    for (; main->setting.objects.used < main->setting.nest.depth[0].used; ++main->setting.objects.used) {
+    for (; main->setting.objects.used < main->setting.nest.depth[depth].used; ++main->setting.objects.used) {
 
-      main->setting.objects.array[main->setting.objects.used] = main->setting.nest.depth[0].array[main->setting.objects.used].object;
+      main->setting.objects.array[main->setting.objects.used] = main->setting.nest.depth[depth].array[main->setting.objects.used].object;
 
       // Use a static array for the inner Content that points to the depth, and so ensure the size is 0 to designate this is not dynamically allocated here.
-      if (main->setting.nest.depth[0].array[main->setting.objects.used].content.used) {
-        main->setting.contents.array[main->setting.objects.used].array = main->setting.nest.depth[0].array[main->setting.objects.used].content.array;
-        main->setting.contents.array[main->setting.objects.used].used = main->setting.nest.depth[0].array[main->setting.objects.used].content.used;
+      if (main->setting.nest.depth[depth].array[main->setting.objects.used].content.used) {
+        main->setting.contents.array[main->setting.objects.used].array = main->setting.nest.depth[depth].array[main->setting.objects.used].content.array;
+        main->setting.contents.array[main->setting.objects.used].used = main->setting.nest.depth[depth].array[main->setting.objects.used].content.used;
         main->setting.contents.array[main->setting.objects.used].size = 0;
-        main->setting.contents.array[main->setting.objects.used].used = main->setting.nest.depth[0].array[main->setting.objects.used].content.used;
       }
       else {
         main->setting.contents.array[main->setting.objects.used].array = 0;
@@ -148,6 +164,8 @@ extern "C" {
     } // for
 
     main->setting.contents.used = main->setting.objects.used;
+
+    fss_read_ensure_quotes_length(main);
   }
 #endif // _di_fss_read_embedded_list_process_normal_determine_depth_
 
diff --git a/level_3/fss_read/c/extended_list/fss_read.c b/level_3/fss_read/c/extended_list/fss_read.c
index 18dafb7..b894701 100644
--- a/level_3/fss_read/c/extended_list/fss_read.c
+++ b/level_3/fss_read/c/extended_list/fss_read.c
@@ -21,7 +21,7 @@ extern "C" {
 
     fss_read_main_t * const main = (fss_read_main_t *) void_main;
 
-    fll_fss_extended_list_read(main->setting.buffer, &main->setting.range, &main->setting.objects, &main->setting.contents, &main->setting.delimits_object, &main->setting.delimits_content, &main->setting.comments, &main->setting.state);
+    fll_fss_extended_list_read(main->setting.buffer, &main->setting.range, &main->setting.objects, &main->setting.closes, &main->setting.contents, &main->setting.delimits_object, &main->setting.delimits_content, &main->setting.comments, &main->setting.state);
 
     if (F_status_is_error(main->setting.state.status)) {
       if (F_status_set_fine(main->setting.state.status) == F_interrupt) return;
diff --git a/level_3/fss_read/c/main/common.c b/level_3/fss_read/c/main/common.c
index 7ee8a8c..704f49f 100644
--- a/level_3/fss_read/c/main/common.c
+++ b/level_3/fss_read/c/main/common.c
@@ -711,6 +711,10 @@ extern "C" {
       } // for
     } // for
 
+    if (main->setting.depths.used) {
+      main->setting.depth = main->setting.depths.array[0];
+    }
+
     main->setting.state.status = F_okay;
   }
 #endif // _di_fss_read_setting_load_depth_
diff --git a/level_3/fss_read/c/main/common/define.h b/level_3/fss_read/c/main/common/define.h
index 8255b37..cc217f8 100644
--- a/level_3/fss_read/c/main/common/define.h
+++ b/level_3/fss_read/c/main/common/define.h
@@ -68,6 +68,7 @@ extern "C" {
  *   - name:                   A specific Object name has been requested.
  *   - object:                 The Object is to be printed.
  *   - object_as_line:         The Object is counted as its own line for the purpose of -l/--line or any other similar behavior.
+ *   - object_content:         A helper flag representing object and content flag bits being set.
  *   - object_trim:            Empty space before an after Objects are ignored while processing without affecting printing behavior.
  *   - original:               Enable original printing, where the quotes are printed and no delimits are applied.
  *   - payload_create:         Create the payload Object with empty Content if the payload Object is missing (when using FSS Payload and related).
@@ -104,6 +105,7 @@ extern "C" {
   #define fss_read_main_flag_name_d                   0x4000
   #define fss_read_main_flag_object_d                 0x8000
   #define fss_read_main_flag_object_as_line_d         0x10000
+  #define fss_read_main_flag_object_content_d         0x8004
   #define fss_read_main_flag_object_trim_d            0x20000
   #define fss_read_main_flag_original_d               0x40000
   #define fss_read_main_flag_payload_create_d         0x80000
diff --git a/level_3/fss_read/c/main/common/type.c b/level_3/fss_read/c/main/common/type.c
index de2485c..4ddb5af 100644
--- a/level_3/fss_read/c/main/common/type.c
+++ b/level_3/fss_read/c/main/common/type.c
@@ -90,6 +90,7 @@ extern "C" {
     f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->buffer.string, &setting->buffer.used, &setting->buffer.size);
 
     f_memory_array_resize(0, sizeof(f_range_t), (void **) &setting->objects.array, &setting->objects.used, &setting->objects.size);
+    f_memory_array_resize(0, sizeof(f_range_t), (void **) &setting->closes.array, &setting->closes.used, &setting->closes.size);
     f_memory_array_resize(0, sizeof(f_range_t), (void **) &setting->comments.array, &setting->comments.used, &setting->comments.size);
     f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &setting->contents.array, &setting->contents.used, &setting->contents.size, &f_rangess_delete_callback);
 
diff --git a/level_3/fss_read/c/main/common/type.h b/level_3/fss_read/c/main/common/type.h
index f629a97..1511b4c 100644
--- a/level_3/fss_read/c/main/common/type.h
+++ b/level_3/fss_read/c/main/common/type.h
@@ -117,18 +117,20 @@ extern "C" {
 /**
  * The FSS Read cache.
  *
- * objects:   An objects array used by the fll_fss_embedded_list_read() function.
+ * objects:   An Objects array used by the fll_fss_embedded_list_read() function.
+ * closes:    An Object closes array used by the fll_fss_embedded_list_read() function.
  * positions: A positions array used by the fll_fss_embedded_list_read() function.
  * slashes:   A slashes array used by the fll_fss_embedded_list_read() function.
  */
 #ifndef _di_fss_read_cache_t_
   typedef struct {
     f_ranges_t objects;
+    f_ranges_t closes;
     f_number_unsigneds_t positions;
     f_number_unsigneds_t slashes;
   } fss_read_cache_t;
 
-  #define fss_read_cache_t_initialize { f_ranges_t_initialize, f_number_unsigneds_t_initialize, f_number_unsigneds_t_initialize }
+  #define fss_read_cache_t_initialize { f_ranges_t_initialize, f_ranges_t_initialize, f_number_unsigneds_t_initialize, f_number_unsigneds_t_initialize }
 #endif // _di_fss_read_cache_t_
 
 /**
@@ -226,6 +228,7 @@ extern "C" {
  * range: A range used in conjunction with some buffer during processing.
  *
  * files:  A statically allocated array of files for designating where in the buffer a file is represented.
+ * depth:  The active depth to use.
  * depths: The array of parameters for each given depth.
  *
  * standard: A human-friendly string describing the standard in use, such as "FSS-0000 (Basic)".
@@ -255,11 +258,13 @@ extern "C" {
     f_range_t range;
 
     fss_read_files_t files;
+    fss_read_depth_t depth;
     fss_read_depths_t depths;
 
     f_string_static_t standard;
     f_string_dynamic_t buffer;
 
+    f_ranges_t closes;
     f_ranges_t comments;
     f_rangess_t contents;
     f_number_unsigneds_t delimits_object;
@@ -282,10 +287,12 @@ extern "C" {
       0, \
       f_range_t_initialize, \
       fss_read_files_t_initialize, \
+      fss_read_depth_t_initialize, \
       fss_read_depths_t_initialize, \
       f_string_static_t_initialize, \
       f_string_dynamic_t_initialize, \
       f_ranges_t_initialize, \
+      f_ranges_t_initialize, \
       f_rangess_t_initialize, \
       f_number_unsigneds_t_initialize, \
       f_number_unsigneds_t_initialize, \
diff --git a/level_3/fss_read/c/main/fss_read.c b/level_3/fss_read/c/main/fss_read.c
index ed81862..328666c 100644
--- a/level_3/fss_read/c/main/fss_read.c
+++ b/level_3/fss_read/c/main/fss_read.c
@@ -75,7 +75,7 @@ extern "C" {
       return;
     }
 
-    if (main->setting.flag & (fss_read_main_flag_object_d | fss_read_main_flag_content_d)) {
+    if (main->setting.flag & fss_read_main_flag_object_content_d) {
       if (main->callback.process_normal) {
         main->callback.process_normal(void_main);
       }
diff --git a/level_3/fss_read/c/main/process_normal.c b/level_3/fss_read/c/main/process_normal.c
index 4a36a89..5972fa6 100644
--- a/level_3/fss_read/c/main/process_normal.c
+++ b/level_3/fss_read/c/main/process_normal.c
@@ -13,7 +13,7 @@ extern "C" {
 
     // For depth, most standards do not support nesting, so any depth greater than 0 can be predicted without processing the buffer.
     // For select, most standards do not support multiple select, so any select greater than 0 can be predicted without processing the buffer.
-    if (!(main->setting.flag & fss_read_main_flag_depth_multiple_d) && main->setting.depths.array[0].depth || !(main->setting.flag & fss_read_main_flag_content_multiple_d) && ((main->setting.flag & fss_read_main_flag_select_d) && main->setting.select)) {
+    if (!(main->setting.flag & fss_read_main_flag_depth_multiple_d) && main->setting.depth.depth || !(main->setting.flag & fss_read_main_flag_content_multiple_d) && ((main->setting.flag & fss_read_main_flag_select_d) && main->setting.select)) {
       if (main->setting.flag & fss_read_main_flag_total_d) {
         fss_read_print_number(&main->program.output, 0);
       }
@@ -119,7 +119,7 @@ extern "C" {
 
     fss_read_main_t * const main = (fss_read_main_t *) void_main;
 
-    if (main->setting.depths.array[0].value_at >= main->setting.objects.used) {
+    if (main->setting.depth.value_at >= main->setting.objects.used) {
       if (main->setting.flag & (fss_read_main_flag_columns_d | fss_read_main_flag_total_d)) {
         fss_read_print_number(&main->program.output, 0);
       }
@@ -146,7 +146,7 @@ extern "C" {
       if (!names[i]) continue;
       if (fss_read_signal_check(main)) return;
 
-      if (at == main->setting.depths.array[0].value_at) {
+      if (at == main->setting.depth.value_at) {
         if (main->setting.flag & fss_read_main_flag_line_d) {
 
           // If using "--at" for standards that only support one line per Object, then the only valid line is line 0.
@@ -489,7 +489,7 @@ extern "C" {
 
     fss_read_main_t * const main = (fss_read_main_t *) void_main;
 
-    if (main->setting.depths.array[0].index_name) {
+    if (main->setting.depth.index_name) {
       f_number_unsigned_t i = 0;
 
       memset(names, F_false, sizeof(bool) * main->setting.objects.used);
@@ -499,7 +499,7 @@ extern "C" {
 
           if (fss_read_signal_check(main)) return;
 
-          if (f_compare_dynamic_partial_except_trim_dynamic(main->setting.depths.array[0].value_name, main->setting.buffer, main->setting.objects.array[i], fss_read_except_none_c, main->setting.delimits_object) == F_equal_to) {
+          if (f_compare_dynamic_partial_except_trim_dynamic(main->setting.depth.value_name, main->setting.buffer, main->setting.objects.array[i], fss_read_except_none_c, main->setting.delimits_object) == F_equal_to) {
             names[i] = F_true;
           }
         } // for
@@ -509,7 +509,7 @@ extern "C" {
 
           if (fss_read_signal_check(main)) return;
 
-          if (f_compare_dynamic_partial_except_dynamic(main->setting.depths.array[0].value_name, main->setting.buffer, main->setting.objects.array[i], fss_read_except_none_c, main->setting.delimits_object) == F_equal_to) {
+          if (f_compare_dynamic_partial_except_dynamic(main->setting.depth.value_name, main->setting.buffer, main->setting.objects.array[i], fss_read_except_none_c, main->setting.delimits_object) == F_equal_to) {
             names[i] = F_true;
           }
         } // for
@@ -540,7 +540,7 @@ extern "C" {
         if (fss_read_signal_check(main)) return;
 
         if (main->setting.flag & fss_read_main_flag_at_d) {
-          if (main->setting.depths.array[0].value_at != i) continue;
+          if (main->setting.depth.value_at != i) continue;
         }
 
         if (main->setting.contents.array[i].used) {
@@ -561,8 +561,7 @@ extern "C" {
         if (!names[i]) continue;
         if (fss_read_signal_check(main)) return;
 
-        // @fixme all uses of "depths" may need to be changed so that standards that handle depth and those that don't select the currect structure at places like this.
-        if (at < main->setting.depths.array[0].value_at) {
+        if (at < main->setting.depth.value_at) {
           ++at;
 
           continue;
@@ -625,7 +624,7 @@ extern "C" {
         if (fss_read_signal_check(main)) return;
 
         if (main->setting.flag & fss_read_main_flag_at_d) {
-          if (main->setting.depths.array[0].value_at != at) continue;
+          if (main->setting.depth.value_at != at) continue;
         }
 
         if (main->setting.flag & fss_read_main_flag_object_d) {
@@ -691,7 +690,7 @@ extern "C" {
         if (fss_read_signal_check(main)) return;
 
         if (main->setting.flag & fss_read_main_flag_at_d) {
-          if (main->setting.depths.array[0].value_at != at) continue;
+          if (main->setting.depth.value_at != at) continue;
         }
 
         if (!(main->setting.flag & fss_read_main_flag_object_d) && (main->setting.flag & fss_read_main_flag_content_d)) {
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-columns-empty.expect
index 5c6833d..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-columns-empty.expect
@@ -1,11 +1 @@
-  b c
-  e f
-  g h
-  мир
-  z
-  quoted, "yep".
-  \"and so does this" "have space"
-  But still a valid list.
-  Check this.
-  ...
-  a second "a".
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-columns.expect
index 5c6833d..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-columns.expect
@@ -1,11 +1 @@
-  b c
-  e f
-  g h
-  мир
-  z
-  quoted, "yep".
-  \"and so does this" "have space"
-  But still a valid list.
-  Check this.
-  ...
-  a second "a".
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name--select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name--select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name--select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name--select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-columns-empty.expect
index c686608..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-columns-empty.expect
@@ -1,3 +1 @@
-  e f
-  g h
-  a second "a".
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-columns.expect
index c686608..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-columns.expect
@@ -1,3 +1 @@
-  e f
-  g h
-  a second "a".
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-100-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-100-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-100-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-100-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-2-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-2-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-2-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-2-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-5-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-5-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-5-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-5-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-6-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-6-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-6-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-a-select-6-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-1-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-1-empty-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-1-empty-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-1-empty-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-payload-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-payload-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-payload-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-payload-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\274\320\270\321\200-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\274\320\270\321\200-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\274\320\270\321\200-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\274\320\270\321\200-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-columns.expect
index 65b0a48..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-columns.expect
@@ -1,13 +1 @@
-empty
-d
-a
-привет
-y 
-"мир"
-привет has space
-"This is quoted"
-AlsoGood
-hi     
-привет has space   
-a
-also_empty
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0.expect
index 65b0a48..c6cac69 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0.expect
@@ -1,13 +1 @@
 empty
-d
-a
-привет
-y 
-"мир"
-привет has space
-"This is quoted"
-AlsoGood
-hi     
-привет has space   
-a
-also_empty
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1.expect
index 65b0a48..4bcfe98 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1.expect
@@ -1,13 +1 @@
-empty
 d
-a
-привет
-y 
-"мир"
-привет has space
-"This is quoted"
-AlsoGood
-hi     
-привет has space   
-a
-also_empty
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-100.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-100.expect
index 65b0a48..e69de29 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-100.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-100.expect
@@ -1,13 +0,0 @@
-empty
-d
-a
-привет
-y 
-"мир"
-привет has space
-"This is quoted"
-AlsoGood
-hi     
-привет has space   
-a
-also_empty
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5.expect
index 65b0a48..2057e0f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5.expect
@@ -1,13 +1 @@
-empty
-d
-a
-привет
-y 
 "мир"
-привет has space
-"This is quoted"
-AlsoGood
-hi     
-привет has space   
-a
-also_empty
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6.expect
index 65b0a48..9a900be 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6.expect
@@ -1,13 +1 @@
-empty
-d
-a
-привет
-y 
-"мир"
 привет has space
-"This is quoted"
-AlsoGood
-hi     
-привет has space   
-a
-also_empty
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name--select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name--select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name--select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name--select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns-empty.expect
index 7e8a165..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns-empty.expect
@@ -1,2 +1 @@
-a
-a
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns.expect
index 7e8a165..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns.expect
@@ -1,2 +1 @@
-a
-a
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-100-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-100-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-100-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-100-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-2-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-2-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-2-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-2-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-5-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-5-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-5-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-5-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-6-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-6-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-6-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-select-6-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-1-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-1-empty-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-1-empty-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-1-empty-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-payload-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-payload-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-payload-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-payload-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\274\320\270\321\200-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\274\320\270\321\200-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\274\320\270\321\200-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\274\320\270\321\200-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-columns-empty.expect
index a3d6a83..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-columns-empty.expect
@@ -1,37 +1 @@
-empty{
-}
-d{
-  b c
-}
-a{
-  e f
-  g h
-}
-привет{
-  мир
-}
-y {
-  z
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  \"and so does this" "have space"
-}
-"This is quoted"{
-  But still a valid list.
-}
-AlsoGood{
-}
-hi     {
-  Check this.
-}
-привет has space   {
-  ...
-}
-a{
-  a second "a".
-}
-also_empty{
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-columns.expect
index a3d6a83..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-columns.expect
@@ -1,37 +1 @@
-empty{
-}
-d{
-  b c
-}
-a{
-  e f
-  g h
-}
-привет{
-  мир
-}
-y {
-  z
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  \"and so does this" "have space"
-}
-"This is quoted"{
-  But still a valid list.
-}
-AlsoGood{
-}
-hi     {
-  Check this.
-}
-привет has space   {
-  ...
-}
-a{
-  a second "a".
-}
-also_empty{
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0.expect
index a3d6a83..fec5380 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0.expect
@@ -1,37 +1 @@
 empty{
-}
-d{
-  b c
-}
-a{
-  e f
-  g h
-}
-привет{
-  мир
-}
-y {
-  z
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  \"and so does this" "have space"
-}
-"This is quoted"{
-  But still a valid list.
-}
-AlsoGood{
-}
-hi     {
-  Check this.
-}
-привет has space   {
-  ...
-}
-a{
-  a second "a".
-}
-also_empty{
-}
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1.expect
index a3d6a83..5c34318 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1.expect
@@ -1,37 +1 @@
-empty{
-}
-d{
-  b c
-}
-a{
-  e f
-  g h
-}
-привет{
-  мир
-}
-y {
-  z
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  \"and so does this" "have space"
-}
-"This is quoted"{
-  But still a valid list.
-}
-AlsoGood{
-}
-hi     {
-  Check this.
-}
-привет has space   {
-  ...
-}
-a{
-  a second "a".
-}
-also_empty{
 }
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-100.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-100.expect
index a3d6a83..e69de29 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-100.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-100.expect
@@ -1,37 +0,0 @@
-empty{
-}
-d{
-  b c
-}
-a{
-  e f
-  g h
-}
-привет{
-  мир
-}
-y {
-  z
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  \"and so does this" "have space"
-}
-"This is quoted"{
-  But still a valid list.
-}
-AlsoGood{
-}
-hi     {
-  Check this.
-}
-привет has space   {
-  ...
-}
-a{
-  a second "a".
-}
-also_empty{
-}
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5.expect
index a3d6a83..85a90f6 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5.expect
@@ -1,37 +1 @@
-empty{
-}
-d{
-  b c
-}
 a{
-  e f
-  g h
-}
-привет{
-  мир
-}
-y {
-  z
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  \"and so does this" "have space"
-}
-"This is quoted"{
-  But still a valid list.
-}
-AlsoGood{
-}
-hi     {
-  Check this.
-}
-привет has space   {
-  ...
-}
-a{
-  a second "a".
-}
-also_empty{
-}
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6.expect
index a3d6a83..b19e23b 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6.expect
@@ -1,37 +1 @@
-empty{
-}
-d{
-  b c
-}
-a{
   e f
-  g h
-}
-привет{
-  мир
-}
-y {
-  z
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  \"and so does this" "have space"
-}
-"This is quoted"{
-  But still a valid list.
-}
-AlsoGood{
-}
-hi     {
-  Check this.
-}
-привет has space   {
-  ...
-}
-a{
-  a second "a".
-}
-also_empty{
-}
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name--select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name--select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name--select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name--select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-columns-empty.expect
index e6fcb9e..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-columns-empty.expect
@@ -1,7 +1 @@
-a{
-  e f
-  g h
-}
-a{
-  a second "a".
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-columns.expect
index e6fcb9e..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-columns.expect
@@ -1,7 +1 @@
-a{
-  e f
-  g h
-}
-a{
-  a second "a".
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-0-total.expect
index 0cfbf08..7f8f011 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-0-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-0-total.expect
@@ -1 +1 @@
-2
+7
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-100-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-100-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-100-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-100-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-2-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-2-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-2-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-2-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-5-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-5-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-5-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-5-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-6-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-6-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-6-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-select-6-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-total.expect
index 0cfbf08..7f8f011 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-a-total.expect
@@ -1 +1 @@
-2
+7
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-1-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-1-empty-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-1-empty-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-1-empty-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-payload-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-payload-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-payload-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-payload-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect"
index d00491f..00750ed 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect"
@@ -1 +1 @@
-1
+3
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect"
index d00491f..00750ed 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect"
@@ -1 +1 @@
-1
+3
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-total.expect
index b1bd38b..81b5c5d 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-total.expect
@@ -1 +1 @@
-13
+37
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-columns.expect
index 5b9284d..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-columns.expect
@@ -1,3 +1 @@
-  The object name is an empty string.
-  Quotes aren't supported here, so this is not an empty object..
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name--select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name--select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name--select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name--select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns-empty.expect
index e69de29..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns-empty.expect
@@ -0,0 +1 @@
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns.expect
index 573541a..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns.expect
@@ -1 +1 @@
-0
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-100-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-100-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-100-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-100-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-2-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-2-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-2-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-2-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-5-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-5-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-5-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-5-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-6-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-6-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-6-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-select-6-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-hi-select-1-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-hi-select-1-empty-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-hi-select-1-empty-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-hi-select-1-empty-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-hi-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-hi-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-hi-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-hi-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-payload-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-payload-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-payload-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-payload-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-\320\274\320\270\321\200-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-\320\274\320\270\321\200-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-\320\274\320\270\321\200-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-\320\274\320\270\321\200-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-columns.expect
index f9a7535..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-columns.expect
@@ -1,7 +1 @@
-a
-hi
-a
-a  
-
-
-""
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0.expect
index f9a7535..7898192 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0.expect
@@ -1,7 +1 @@
 a
-hi
-a
-a  
-
-
-""
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1.expect
index f9a7535..45b983b 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1.expect
@@ -1,7 +1 @@
-a
 hi
-a
-a  
-
-
-""
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-100.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-100.expect
index f9a7535..e69de29 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-100.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-100.expect
@@ -1,7 +0,0 @@
-a
-hi
-a
-a  
-
-
-""
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5.expect
index f9a7535..8b13789 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5.expect
@@ -1,7 +1 @@
-a
-hi
-a
-a  
 
-
-""
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6.expect
index f9a7535..e16c76d 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6.expect
@@ -1,7 +1 @@
-a
-hi
-a
-a  
-
-
 ""
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name--select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name--select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name--select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name--select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns-empty.expect
index 7e8a165..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns-empty.expect
@@ -1,2 +1 @@
-a
-a
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns.expect
index 7e8a165..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns.expect
@@ -1,2 +1 @@
-a
-a
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-100-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-100-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-100-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-100-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-2-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-2-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-2-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-2-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-5-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-5-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-5-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-5-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-6-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-6-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-6-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-6-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-hi-select-1-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-hi-select-1-empty-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-hi-select-1-empty-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-hi-select-1-empty-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-hi-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-hi-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-hi-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-hi-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-payload-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-payload-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-payload-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-payload-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-\320\274\320\270\321\200-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-\320\274\320\270\321\200-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-\320\274\320\270\321\200-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-\320\274\320\270\321\200-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-columns-empty.expect
index 49d85ba..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-columns-empty.expect
@@ -1,17 +1 @@
-a{
-}
-hi{
-}
-a{
-}
-a  {
-}
-{
-  The object name is an empty string.
-}
-{
-}
-""{
-  Quotes aren't supported here, so this is not an empty object..
-}
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-columns.expect
index 49d85ba..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-columns.expect
@@ -1,17 +1 @@
-a{
-}
-hi{
-}
-a{
-}
-a  {
-}
-{
-  The object name is an empty string.
-}
-{
-}
-""{
-  Quotes aren't supported here, so this is not an empty object..
-}
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0.expect
index 49d85ba..85a90f6 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0.expect
@@ -1,17 +1 @@
 a{
-}
-hi{
-}
-a{
-}
-a  {
-}
-{
-  The object name is an empty string.
-}
-{
-}
-""{
-  Quotes aren't supported here, so this is not an empty object..
-}
-}
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1.expect
index 49d85ba..5c34318 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1.expect
@@ -1,17 +1 @@
-a{
-}
-hi{
-}
-a{
-}
-a  {
-}
-{
-  The object name is an empty string.
-}
-{
-}
-""{
-  Quotes aren't supported here, so this is not an empty object..
-}
 }
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-100.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-100.expect
index 49d85ba..e69de29 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-100.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-100.expect
@@ -1,17 +0,0 @@
-a{
-}
-hi{
-}
-a{
-}
-a  {
-}
-{
-  The object name is an empty string.
-}
-{
-}
-""{
-  Quotes aren't supported here, so this is not an empty object..
-}
-}
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5.expect
index 49d85ba..5c34318 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5.expect
@@ -1,17 +1 @@
-a{
-}
-hi{
-}
-a{
-}
-a  {
-}
-{
-  The object name is an empty string.
-}
-{
-}
-""{
-  Quotes aren't supported here, so this is not an empty object..
-}
 }
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6.expect
index 49d85ba..2c3a87c 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6.expect
@@ -1,17 +1 @@
-a{
-}
-hi{
-}
-a{
-}
 a  {
-}
-{
-  The object name is an empty string.
-}
-{
-}
-""{
-  Quotes aren't supported here, so this is not an empty object..
-}
-}
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--select-0-total.expect
index 0cfbf08..7ed6ff8 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--select-0-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--select-0-total.expect
@@ -1 +1 @@
-2
+5
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--total.expect
index 0cfbf08..7ed6ff8 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name--total.expect
@@ -1 +1 @@
-2
+5
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns-empty.expect
index 4d470a3..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns-empty.expect
@@ -1,4 +1 @@
-a{
-}
-a{
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns.expect
index 4d470a3..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns.expect
@@ -1,4 +1 @@
-a{
-}
-a{
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0-total.expect
index 0cfbf08..b8626c4 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0-total.expect
@@ -1 +1 @@
-2
+4
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-100-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-100-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-100-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-100-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-2-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-2-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-2-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-2-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-5-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-5-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-5-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-5-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-6-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-6-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-6-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-6-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-total.expect
index 0cfbf08..b8626c4 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-total.expect
@@ -1 +1 @@
-2
+4
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-0-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-0-empty-total.expect
index d00491f..0cfbf08 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-0-empty-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-0-empty-total.expect
@@ -1 +1 @@
-1
+2
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-0-total.expect
index d00491f..0cfbf08 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-0-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-0-total.expect
@@ -1 +1 @@
-1
+2
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-1-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-1-empty-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-1-empty-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-1-empty-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-total.expect
index d00491f..0cfbf08 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-hi-total.expect
@@ -1 +1 @@
-1
+2
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-payload-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-payload-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-payload-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-payload-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-total.expect
index 7f8f011..98d9bcb 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-total.expect
@@ -1 +1 @@
-7
+17
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-columns-empty.expect
index bbd7eb3..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-columns-empty.expect
@@ -1,20 +1 @@
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-  another "A" list.
-  quoted, "yep".
-  # has a comment
-  But this is not a comment.
-  not a list\:
-  a b привет
-  c d
-  привет мир a 
-
-  yep.
-  fin  
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-columns.expect
index bbd7eb3..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-columns.expect
@@ -1,20 +1 @@
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-  another "A" list.
-  quoted, "yep".
-  # has a comment
-  But this is not a comment.
-  not a list\:
-  a b привет
-  c d
-  привет мир a 
-
-  yep.
-  fin  
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-columns-empty.expect
index 0386be0..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-columns-empty.expect
@@ -1,10 +1 @@
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-  another "A" list.
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-columns.expect
index 0386be0..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-columns.expect
@@ -1,10 +1 @@
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-  another "A" list.
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-select-0-total.expect
index 0cfbf08..f599e28 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-select-0-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-a-select-0-total.expect
@@ -1 +1 @@
-2
+10
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect"
index 0cfbf08..d00491f 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect"
@@ -1 +1 @@
-2
+1
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect"
index 29ae14d..9965c73 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect"
@@ -1,2 +1 @@
-  # has a comment
   But this is not a comment.
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect"
index 0cfbf08..d00491f 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect"
@@ -1 +1 @@
-2
+1
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect"
index 29ae14d..9965c73 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect"
@@ -1,2 +1 @@
-  # has a comment
   But this is not a comment.
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-original.expect
index 53d1e7a..959ccee 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-original.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-original.expect
@@ -9,7 +9,6 @@ c d
    with content.
   another "A" list.
   quoted, "yep".
-  # has a comment
   But this is not a comment.
   not a list\:
   a b привет
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0-original.expect
index 53d1e7a..959ccee 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0-original.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0-original.expect
@@ -9,7 +9,6 @@ c d
    with content.
   another "A" list.
   quoted, "yep".
-  # has a comment
   But this is not a comment.
   not a list\:
   a b привет
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0.expect
index bbd7eb3..9c5c57b 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-select-0.expect
@@ -9,7 +9,6 @@ c d
    with content.
   another "A" list.
   quoted, "yep".
-  # has a comment
   But this is not a comment.
   not a list\:
   a b привет
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-total.expect
index 209e3ef..d6b2404 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-total.expect
@@ -1 +1 @@
-20
+19
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-trim.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-trim.expect
index bbd7eb3..9c5c57b 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-trim.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content-trim.expect
@@ -9,7 +9,6 @@ c d
    with content.
   another "A" list.
   quoted, "yep".
-  # has a comment
   But this is not a comment.
   not a list\:
   a b привет
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content.expect
index bbd7eb3..9c5c57b 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-content.expect
@@ -9,7 +9,6 @@ c d
    with content.
   another "A" list.
   quoted, "yep".
-  # has a comment
   But this is not a comment.
   not a list\:
   a b привет
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-columns.expect
index 67eb63b..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-columns.expect
@@ -1,7 +1 @@
-a
-a
-"мир"
-привет has space
-empty
-hi
-has spaces 
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0.expect
index 67eb63b..7898192 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0.expect
@@ -1,7 +1 @@
 a
-a
-"мир"
-привет has space
-empty
-hi
-has spaces 
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1.expect
index 67eb63b..7898192 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1.expect
@@ -1,7 +1 @@
 a
-a
-"мир"
-привет has space
-empty
-hi
-has spaces 
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-100.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-100.expect
index 67eb63b..e69de29 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-100.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-100.expect
@@ -1,7 +0,0 @@
-a
-a
-"мир"
-привет has space
-empty
-hi
-has spaces 
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5.expect
index 67eb63b..45b983b 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5.expect
@@ -1,7 +1 @@
-a
-a
-"мир"
-привет has space
-empty
 hi
-has spaces 
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6.expect
index 67eb63b..0fb99b1 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6.expect
@@ -1,7 +1 @@
-a
-a
-"мир"
-привет has space
-empty
-hi
 has spaces 
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name--select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name--select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name--select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name--select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns-empty.expect
index 7e8a165..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns-empty.expect
@@ -1,2 +1 @@
-a
-a
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns.expect
index 7e8a165..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns.expect
@@ -1,2 +1 @@
-a
-a
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-100-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-100-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-100-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-100-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-2-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-2-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-2-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-2-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-5-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-5-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-5-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-5-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-6-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-6-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-6-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-select-6-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-hi-select-1-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-hi-select-1-empty-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-hi-select-1-empty-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-hi-select-1-empty-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-hi-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-hi-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-hi-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-hi-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-payload-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-payload-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-payload-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-payload-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-\320\274\320\270\321\200-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-\320\274\320\270\321\200-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-\320\274\320\270\321\200-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-\320\274\320\270\321\200-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-columns-empty.expect
index 9d794f3..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-columns-empty.expect
@@ -1,34 +1 @@
-a{
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-}
-a{
-  another "A" list.
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  # has a comment
-  But this is not a comment.
-}
-empty{
-}
-hi{
-  not a list\:
-  a b привет
-  c d
-  привет мир a 
-
-}
-has spaces {
-  yep.
-  fin  
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-columns.expect
index 9d794f3..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-columns.expect
@@ -1,34 +1 @@
-a{
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-}
-a{
-  another "A" list.
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  # has a comment
-  But this is not a comment.
-}
-empty{
-}
-hi{
-  not a list\:
-  a b привет
-  c d
-  привет мир a 
-
-}
-has spaces {
-  yep.
-  fin  
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect
index 9d794f3..85a90f6 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect
@@ -1,34 +1 @@
 a{
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-}
-a{
-  another "A" list.
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  # has a comment
-  But this is not a comment.
-}
-empty{
-}
-hi{
-  not a list\:
-  a b привет
-  c d
-  привет мир a 
-
-}
-has spaces {
-  yep.
-  fin  
-}
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect
index 9d794f3..e50021b 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect
@@ -1,34 +1 @@
-a{
 a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-}
-a{
-  another "A" list.
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  # has a comment
-  But this is not a comment.
-}
-empty{
-}
-hi{
-  not a list\:
-  a b привет
-  c d
-  привет мир a 
-
-}
-has spaces {
-  yep.
-  fin  
-}
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect
index 9d794f3..e69de29 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect
@@ -1,34 +0,0 @@
-a{
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-}
-a{
-  another "A" list.
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  # has a comment
-  But this is not a comment.
-}
-empty{
-}
-hi{
-  not a list\:
-  a b привет
-  c d
-  привет мир a 
-
-}
-has spaces {
-  yep.
-  fin  
-}
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect
index 9d794f3..311f4e4 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect
@@ -1,34 +1 @@
-a{
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-}
-a{
-  another "A" list.
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  # has a comment
-  But this is not a comment.
-}
-empty{
-}
-hi{
-  not a list\:
-  a b привет
-  c d
-  привет мир a 
-
-}
-has spaces {
-  yep.
-  fin  
-}
+\\# even this is not.
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect
index 9d794f3..9c5d8ed 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect
@@ -1,34 +1 @@
-a{
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
 привет мир a 
-  
- # a valid list:
-   with content.
-}
-a{
-  another "A" list.
-}
-"мир"{
-  quoted, "yep".
-}
-привет has space{
-  # has a comment
-  But this is not a comment.
-}
-empty{
-}
-hi{
-  not a list\:
-  a b привет
-  c d
-  привет мир a 
-
-}
-has spaces {
-  yep.
-  fin  
-}
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name--select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name--select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name--select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name--select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-columns-empty.expect
index e5f0c47..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-columns-empty.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-columns-empty.expect
@@ -1,14 +1 @@
-a{
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-}
-a{
-  another "A" list.
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-columns.expect
index e5f0c47..d00491f 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-columns.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-columns.expect
@@ -1,14 +1 @@
-a{
-a b привет
-c d
- # not a comment
- \\# nor is this.
-\# even this is not.
-привет мир a 
-  
- # a valid list:
-   with content.
-}
-a{
-  another "A" list.
-}
+1
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-0-total.expect
index 0cfbf08..8351c19 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-0-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-0-total.expect
@@ -1 +1 @@
-2
+14
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-100-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-100-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-100-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-100-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-2-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-2-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-2-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-2-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-5-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-5-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-5-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-5-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-6-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-6-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-6-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-select-6-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-total.expect
index 0cfbf08..8351c19 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-a-total.expect
@@ -1 +1 @@
-2
+14
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-0-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-0-empty-total.expect
index d00491f..7f8f011 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-0-empty-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-0-empty-total.expect
@@ -1 +1 @@
-1
+7
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-0-total.expect
index d00491f..7f8f011 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-0-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-0-total.expect
@@ -1 +1 @@
-1
+7
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-1-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-1-empty-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-1-empty-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-1-empty-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-total.expect
index d00491f..7f8f011 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-hi-total.expect
@@ -1 +1 @@
-1
+7
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-payload-select-1-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-payload-select-1-total.expect
index e69de29..573541a 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-payload-select-1-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-payload-select-1-total.expect
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\274\320\270\321\200-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect"
index d00491f..00750ed 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect"
@@ -1 +1 @@
-1
+3
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect"
index fad0fdc..171efdd 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect"
@@ -1,4 +1,3 @@
 привет has space{
-  # has a comment
   But this is not a comment.
 }
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
index e69de29..573541a 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-1-total.expect"
@@ -0,0 +1 @@
+0
diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect"
index d00491f..00750ed 100644
--- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect"
+++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect"
@@ -1 +1 @@
-1
+3
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-original.expect
index 501583e..025cdb4 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-original.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-original.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0.expect
index 9d794f3..0a7c3b0 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-total.expect
index 7f8f011..bb95160 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-total.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-total.expect
@@ -1 +1 @@
-7
+33
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-trim.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-trim.expect
index 84340a2..8ac8e0e 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-trim.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-trim.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{
diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content.expect
index 9d794f3..0a7c3b0 100644
--- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content.expect
+++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content.expect
@@ -16,7 +16,6 @@ a{
   quoted, "yep".
 }
 привет has space{
-  # has a comment
   But this is not a comment.
 }
 empty{
-- 
1.8.3.1