diff --git a/src/error/error.rs b/src/error/error.rs
index 37e3804..ef61469 100644
--- a/src/error/error.rs
+++ b/src/error/error.rs
@@ -4,6 +4,7 @@ use nom::IResult;
 
 pub type Res<T, U> = IResult<T, U, CustomError<T>>;
 
+// TODO: MyError probably shouldn't be based on the same type as the input type since it's used exclusively with static strings right now.
 #[derive(Debug, PartialEq)]
 pub enum CustomError<I> {
     MyError(MyError<I>),
diff --git a/src/parser/angle_link.rs b/src/parser/angle_link.rs
index 5ee81b1..24664b9 100644
--- a/src/parser/angle_link.rs
+++ b/src/parser/angle_link.rs
@@ -4,6 +4,7 @@ use nom::combinator::peek;
 use nom::combinator::recognize;
 use nom::multi::many_till;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::exiting::ExitClass;
@@ -16,7 +17,10 @@ use crate::parser::util::get_consumed;
 use crate::parser::AngleLink;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn angle_link<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, AngleLink<'s>> {
+pub fn angle_link<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, AngleLink<'s>> {
     let (remaining, _) = tag("<")(input)?;
     let (remaining, proto) = protocol(context, remaining)?;
     let (remaining, _separator) = tag(":")(remaining)?;
@@ -26,15 +30,18 @@ pub fn angle_link<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
     Ok((
         remaining,
         AngleLink {
-            source,
-            link_type: proto,
-            path,
+            source: source.into(),
+            link_type: proto.into(),
+            path: path.into(),
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn path_angle<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn path_angle<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -48,6 +55,9 @@ fn path_angle<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn path_angle_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn path_angle_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     tag(">")(input)
 }
diff --git a/src/parser/citation.rs b/src/parser/citation.rs
index 6d7e0a7..dae8b31 100644
--- a/src/parser/citation.rs
+++ b/src/parser/citation.rs
@@ -11,6 +11,7 @@ use nom::multi::many_till;
 use nom::multi::separated_list1;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::Res;
@@ -29,7 +30,10 @@ use crate::parser::util::get_consumed;
 use crate::parser::Object;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn citation<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Citation<'s>> {
+pub fn citation<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Citation<'s>> {
     // TODO: Despite being a standard object, citations cannot exist inside the global prefix/suffix for other citations because citations must contain something that matches @key which is forbidden inside the global prefix/suffix. This TODO is to evaluate if its worth putting in an explicit check for this (which can be easily accomplished by checking the output of `get_bracket_depth()`). I suspect its not worth it because I expect, outside of intentionally crafted inputs, this parser will exit immediately inside a citation since it is unlikely to find the "[cite" substring inside a citation global prefix/suffix.
     let (remaining, _) = tag_no_case("[cite")(input)?;
     let (remaining, _) = opt(citestyle)(remaining)?;
@@ -44,11 +48,16 @@ pub fn citation<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str
     let (remaining, _) = tag("]")(remaining)?;
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, Citation { source }))
+    Ok((
+        remaining,
+        Citation {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn citestyle<'r, 's>(input: &'s str) -> Res<&'s str, &'s str> {
+fn citestyle<'r, 's>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _) = tuple((tag("/"), style))(input)?;
     let (remaining, _) = opt(tuple((tag("/"), variant)))(remaining)?;
     let source = get_consumed(input, remaining);
@@ -56,14 +65,14 @@ fn citestyle<'r, 's>(input: &'s str) -> Res<&'s str, &'s str> {
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn style<'r, 's>(input: &'s str) -> Res<&'s str, &'s str> {
+fn style<'r, 's>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(many1(verify(anychar, |c| {
         c.is_alphanumeric() || "_-".contains(*c)
     })))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn variant<'r, 's>(input: &'s str) -> Res<&'s str, &'s str> {
+fn variant<'r, 's>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(many1(verify(anychar, |c| {
         c.is_alphanumeric() || "_-/".contains(*c)
     })))(input)
@@ -72,8 +81,8 @@ fn variant<'r, 's>(input: &'s str) -> Res<&'s str, &'s str> {
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn global_prefix<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Vec<Object<'s>>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     // TODO: I could insert CitationBracket entries in the context after each matched object to reduce the scanning done for counting brackets which should be more efficient.
     let parser_context = context
         .with_additional_node(ContextElement::CitationBracket(CitationBracket {
@@ -96,12 +105,15 @@ fn global_prefix<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn global_prefix_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn global_prefix_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let context_depth = get_bracket_depth(context)
         .expect("This function should only be called from inside a citation.");
     let text_since_context_entry = get_consumed(context_depth.position, input);
     let mut current_depth = context_depth.depth;
-    for c in text_since_context_entry.chars() {
+    for c in Into::<&str>::into(text_since_context_entry).chars() {
         match c {
             '[' => {
                 current_depth += 1;
@@ -116,7 +128,7 @@ fn global_prefix_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'
         }
     }
     if current_depth == 0 {
-        let close_bracket = tag::<&str, &str, CustomError<&str>>("]")(input);
+        let close_bracket = tag::<&str, OrgSource<'_>, CustomError<OrgSource<'_>>>("]")(input);
         if close_bracket.is_ok() {
             return close_bracket;
         }
@@ -130,8 +142,8 @@ fn global_prefix_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn global_suffix<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Vec<Object<'s>>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     // TODO: I could insert CitationBracket entries in the context after each matched object to reduce the scanning done for counting brackets which should be more efficient.
     let parser_context = context
         .with_additional_node(ContextElement::CitationBracket(CitationBracket {
@@ -153,12 +165,15 @@ fn global_suffix<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn global_suffix_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn global_suffix_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let context_depth = get_bracket_depth(context)
         .expect("This function should only be called from inside a citation.");
     let text_since_context_entry = get_consumed(context_depth.position, input);
     let mut current_depth = context_depth.depth;
-    for c in text_since_context_entry.chars() {
+    for c in Into::<&str>::into(text_since_context_entry).chars() {
         match c {
             '[' => {
                 current_depth += 1;
@@ -173,7 +188,7 @@ fn global_suffix_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'
         }
     }
     if current_depth == 0 {
-        let close_bracket = tag::<&str, &str, CustomError<&str>>("]")(input);
+        let close_bracket = tag::<&str, OrgSource<'_>, CustomError<OrgSource<'_>>>("]")(input);
         if close_bracket.is_ok() {
             return close_bracket;
         }
diff --git a/src/parser/citation_reference.rs b/src/parser/citation_reference.rs
index 4c3d8fe..ed18a65 100644
--- a/src/parser/citation_reference.rs
+++ b/src/parser/citation_reference.rs
@@ -10,6 +10,7 @@ use nom::multi::many_till;
 use nom::sequence::preceded;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::Res;
@@ -28,21 +29,26 @@ use crate::parser::Object;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn citation_reference<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, CitationReference<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, CitationReference<'s>> {
     let (remaining, _prefix) = opt(parser_with_context!(key_prefix)(context))(input)?;
     let (remaining, _key) = parser_with_context!(citation_reference_key)(context)(remaining)?;
     let (remaining, _suffix) = opt(parser_with_context!(key_suffix)(context))(remaining)?;
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, CitationReference { source }))
+    Ok((
+        remaining,
+        CitationReference {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn citation_reference_key<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, source) = recognize(tuple((
         tag("@"),
         many1(verify(
@@ -59,7 +65,10 @@ pub fn citation_reference_key<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn key_prefix<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Vec<Object<'s>>> {
+fn key_prefix<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     // TODO: I could insert CitationBracket entries in the context after each matched object to reduce the scanning done for counting brackets which should be more efficient.
     let parser_context = context
         .with_additional_node(ContextElement::CitationBracket(CitationBracket {
@@ -81,7 +90,10 @@ fn key_prefix<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn key_suffix<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Vec<Object<'s>>> {
+fn key_suffix<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     // TODO: I could insert CitationBracket entries in the context after each matched object to reduce the scanning done for counting brackets which should be more efficient.
     let parser_context = context
         .with_additional_node(ContextElement::CitationBracket(CitationBracket {
@@ -114,12 +126,15 @@ pub fn get_bracket_depth<'r, 's>(context: Context<'r, 's>) -> Option<&'r Citatio
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn key_prefix_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn key_prefix_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let context_depth = get_bracket_depth(context)
         .expect("This function should only be called from inside a citation reference.");
     let text_since_context_entry = get_consumed(context_depth.position, input);
     let mut current_depth = context_depth.depth;
-    for c in text_since_context_entry.chars() {
+    for c in Into::<&str>::into(text_since_context_entry).chars() {
         match c {
             '[' => {
                 current_depth += 1;
@@ -134,7 +149,7 @@ fn key_prefix_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
         }
     }
     if current_depth == 0 {
-        let close_bracket = tag::<&str, &str, CustomError<&str>>("]")(input);
+        let close_bracket = tag::<&str, OrgSource<'_>, CustomError<OrgSource<'_>>>("]")(input);
         if close_bracket.is_ok() {
             return close_bracket;
         }
@@ -146,12 +161,15 @@ fn key_prefix_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn key_suffix_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn key_suffix_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let context_depth = get_bracket_depth(context)
         .expect("This function should only be called from inside a citation reference.");
     let text_since_context_entry = get_consumed(context_depth.position, input);
     let mut current_depth = context_depth.depth;
-    for c in text_since_context_entry.chars() {
+    for c in Into::<&str>::into(text_since_context_entry).chars() {
         match c {
             '[' => {
                 current_depth += 1;
@@ -166,7 +184,7 @@ fn key_suffix_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
         }
     }
     if current_depth == 0 {
-        let close_bracket = tag::<&str, &str, CustomError<&str>>("]")(input);
+        let close_bracket = tag::<&str, OrgSource<'_>, CustomError<OrgSource<'_>>>("]")(input);
         if close_bracket.is_ok() {
             return close_bracket;
         }
diff --git a/src/parser/clock.rs b/src/parser/clock.rs
index ea8ce4a..36c84a7 100644
--- a/src/parser/clock.rs
+++ b/src/parser/clock.rs
@@ -11,6 +11,7 @@ use nom::combinator::recognize;
 use nom::combinator::verify;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::parser_with_context::parser_with_context;
@@ -19,7 +20,10 @@ use crate::parser::util::start_of_line;
 use crate::parser::Clock;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn clock<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Clock<'s>> {
+pub fn clock<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Clock<'s>> {
     start_of_line(context, input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, _clock) = tag_no_case("clock:")(remaining)?;
@@ -31,14 +35,19 @@ pub fn clock<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, C
     ))(remaining)?;
 
     let source = get_consumed(input, remaining);
-    Ok((remaining, Clock { source }))
+    Ok((
+        remaining,
+        Clock {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn inactive_timestamp_range_duration<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(tuple((
         tag("["),
         is_not("\r\n]"),
@@ -50,14 +59,17 @@ fn inactive_timestamp_range_duration<'r, 's>(
         space1,
         digit1,
         tag(":"),
-        verify(digit1, |mm: &str| mm.len() == 2),
+        verify(digit1, |mm: &OrgSource<'_>| mm.len() == 2),
         space0,
         alt((line_ending, eof)),
     )))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn inactive_timestamp<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn inactive_timestamp<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(tuple((
         tag("["),
         is_not("\r\n]"),
diff --git a/src/parser/comment.rs b/src/parser/comment.rs
index de75f1e..c301a5f 100644
--- a/src/parser/comment.rs
+++ b/src/parser/comment.rs
@@ -11,6 +11,7 @@ use nom::multi::many0;
 use nom::sequence::preceded;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::util::get_consumed;
 use super::Context;
 use crate::error::CustomError;
@@ -24,10 +25,13 @@ use crate::parser::util::start_of_line;
 use crate::parser::Comment;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn comment<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Comment<'s>> {
+pub fn comment<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Comment<'s>> {
     if immediate_in_section(context, "comment") {
         return Err(nom::Err::Error(CustomError::MyError(MyError(
-            "Cannot nest objects of the same element",
+            "Cannot nest objects of the same element".into(),
         ))));
     }
     let parser_context = context.with_additional_node(ContextElement::Context("comment"));
@@ -38,11 +42,19 @@ pub fn comment<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
         many0(preceded(not(exit_matcher), comment_line_matcher))(remaining)?;
 
     let source = get_consumed(input, remaining);
-    Ok((remaining, Comment { source }))
+    Ok((
+        remaining,
+        Comment {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn comment_line<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn comment_line<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     let (remaining, _indent) = space0(input)?;
     let (remaining, (_hash, _leading_whitespace_and_content, _line_ending)) = tuple((
diff --git a/src/parser/diary_sexp.rs b/src/parser/diary_sexp.rs
index 9f3b208..869311e 100644
--- a/src/parser/diary_sexp.rs
+++ b/src/parser/diary_sexp.rs
@@ -6,6 +6,7 @@ use nom::combinator::eof;
 use nom::combinator::recognize;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::sexp::sexp;
 use super::Context;
 use crate::error::Res;
@@ -14,7 +15,10 @@ use crate::parser::util::start_of_line;
 use crate::parser::DiarySexp;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn diary_sexp<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, DiarySexp<'s>> {
+pub fn diary_sexp<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, DiarySexp<'s>> {
     start_of_line(context, input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, _clock) = tag("%%")(remaining)?;
@@ -24,5 +28,10 @@ pub fn diary_sexp<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
         recognize(tuple((space0, alt((line_ending, eof)))))(remaining)?;
 
     let source = get_consumed(input, remaining);
-    Ok((remaining, DiarySexp { source }))
+    Ok((
+        remaining,
+        DiarySexp {
+            source: source.into(),
+        },
+    ))
 }
diff --git a/src/parser/document.rs b/src/parser/document.rs
index 43c176e..09ddcd5 100644
--- a/src/parser/document.rs
+++ b/src/parser/document.rs
@@ -16,6 +16,7 @@ use nom::sequence::tuple;
 
 use super::element::Element;
 use super::object::Object;
+use super::org_source::convert_error;
 use super::org_source::OrgSource;
 use super::parser_with_context::parser_with_context;
 use super::source::Source;
@@ -99,7 +100,9 @@ pub fn document(input: &str) -> Res<&str, Document> {
     let wrapped_input = OrgSource::new(input);
     let document_context =
         initial_context.with_additional_node(ContextElement::DocumentRoot(input));
-    let (remaining, document) = _document(&document_context, input)?;
+    let (remaining, document) = _document(&document_context, wrapped_input)
+        .map(|(rem, out)| (Into::<&str>::into(rem), out))
+        .map_err(convert_error)?;
     {
         // If there are radio targets in this document then we need to parse the entire document again with the knowledge of the radio targets.
         let all_radio_targets: Vec<&Vec<Object<'_>>> = document
@@ -117,15 +120,20 @@ pub fn document(input: &str) -> Res<&str, Document> {
         if !all_radio_targets.is_empty() {
             let document_context = document_context
                 .with_additional_node(ContextElement::RadioTarget(all_radio_targets));
-            let (remaining, document) = _document(&document_context, input)?;
-            return Ok((remaining, document));
+            let (remaining, document) = _document(&document_context, wrapped_input)
+                .map(|(rem, out)| (Into::<&str>::into(rem), out))
+                .map_err(convert_error)?;
+            return Ok((remaining.into(), document));
         }
     }
-    Ok((remaining, document))
+    Ok((remaining.into(), document))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn _document<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Document<'s>> {
+fn _document<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Document<'s>> {
     let zeroth_section_matcher = parser_with_context!(zeroth_section)(context);
     let heading_matcher = parser_with_context!(heading)(context);
     let (remaining, _blank_lines) = many0(blank_line)(input)?;
@@ -135,7 +143,7 @@ pub fn _document<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s st
     Ok((
         remaining,
         Document {
-            source,
+            source: source.into(),
             zeroth_section,
             children,
         },
@@ -143,7 +151,10 @@ pub fn _document<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s st
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn zeroth_section<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Section<'s>> {
+fn zeroth_section<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Section<'s>> {
     // TODO: The zeroth section is specialized so it probably needs its own parser
     let parser_context = context
         .with_additional_node(ContextElement::ConsumeTrailingWhitespace(true))
@@ -184,11 +195,20 @@ fn zeroth_section<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
 
     let source = get_consumed(input, remaining);
-    Ok((remaining, Section { source, children }))
+    Ok((
+        remaining,
+        Section {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn section<'r, 's>(context: Context<'r, 's>, mut input: &'s str) -> Res<&'s str, Section<'s>> {
+fn section<'r, 's>(
+    context: Context<'r, 's>,
+    mut input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Section<'s>> {
     // TODO: The zeroth section is specialized so it probably needs its own parser
     let parser_context = context
         .with_additional_node(ContextElement::ConsumeTrailingWhitespace(true))
@@ -225,17 +245,29 @@ fn section<'r, 's>(context: Context<'r, 's>, mut input: &'s str) -> Res<&'s str,
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
 
     let source = get_consumed(input, remaining);
-    Ok((remaining, Section { source, children }))
+    Ok((
+        remaining,
+        Section {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn section_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn section_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let headline_matcher = parser_with_context!(headline)(context);
     recognize(headline_matcher)(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn heading<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Heading<'s>> {
+fn heading<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Heading<'s>> {
     not(|i| context.check_exit_matcher(i))(input)?;
     let (remaining, (star_count, _ws, title)) = headline(context, input)?;
     let section_matcher = parser_with_context!(section)(context);
@@ -251,7 +283,7 @@ fn heading<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Hea
     Ok((
         remaining,
         Heading {
-            source,
+            source: source.into(),
             stars: star_count,
             title,
             children,
@@ -262,8 +294,8 @@ fn heading<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Hea
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn headline<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, (usize, &'s str, Vec<Object<'s>>)> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, (usize, OrgSource<'s>, Vec<Object<'s>>)> {
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Document,
@@ -283,7 +315,10 @@ fn headline<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn headline_end<'r, 's>(_context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn headline_end<'r, 's>(
+    _context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     line_ending(input)
 }
 
diff --git a/src/parser/drawer.rs b/src/parser/drawer.rs
index 6f74617..4e6a842 100644
--- a/src/parser/drawer.rs
+++ b/src/parser/drawer.rs
@@ -10,6 +10,7 @@ use nom::combinator::recognize;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
@@ -31,10 +32,13 @@ use crate::parser::Element;
 use crate::parser::Paragraph;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn drawer<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Drawer<'s>> {
+pub fn drawer<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Drawer<'s>> {
     if immediate_in_section(context, "drawer") {
         return Err(nom::Err::Error(CustomError::MyError(MyError(
-            "Cannot nest objects of the same element",
+            "Cannot nest objects of the same element".into(),
         ))));
     }
     start_of_line(context, input)?;
@@ -63,9 +67,9 @@ pub fn drawer<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
     ))(remaining)
     {
         Ok((remain, (_not_immediate_exit, first_line, (_trailing_whitespace, _exit_contents)))) => {
-            let mut element = Element::Paragraph(Paragraph::of_text(first_line));
+            let mut element = Element::Paragraph(Paragraph::of_text(first_line.into()));
             let source = get_consumed(remaining, remain);
-            element.set_source(source);
+            element.set_source(source.into());
             (remain, vec![element])
         }
         Err(_) => {
@@ -81,20 +85,23 @@ pub fn drawer<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
     Ok((
         remaining,
         Drawer {
-            source,
-            name: drawer_name,
+            source: source.into(),
+            name: drawer_name.into(),
             children,
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn name<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+fn name<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     take_while(|c| WORD_CONSTITUENT_CHARACTERS.contains(c) || "-_".contains(c))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn drawer_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn drawer_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     recognize(tuple((
         space0,
diff --git a/src/parser/dynamic_block.rs b/src/parser/dynamic_block.rs
index dd76b79..30739ff 100644
--- a/src/parser/dynamic_block.rs
+++ b/src/parser/dynamic_block.rs
@@ -11,6 +11,7 @@ use nom::combinator::recognize;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
@@ -33,12 +34,12 @@ use crate::parser::Element;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn dynamic_block<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, DynamicBlock<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, DynamicBlock<'s>> {
     // TODO: Do I need to differentiate between different dynamic block types.
     if immediate_in_section(context, "dynamic block") {
         return Err(nom::Err::Error(CustomError::MyError(MyError(
-            "Cannot nest objects of the same element",
+            "Cannot nest objects of the same element".into(),
         ))));
     }
     start_of_line(context, input)?;
@@ -69,9 +70,9 @@ pub fn dynamic_block<'r, 's>(
     ))(remaining)
     {
         Ok((remain, (_not_immediate_exit, first_line, (_trailing_whitespace, _exit_contents)))) => {
-            let mut element = Element::Paragraph(Paragraph::of_text(first_line));
+            let mut element = Element::Paragraph(Paragraph::of_text(first_line.into()));
             let source = get_consumed(remaining, remain);
-            element.set_source(source);
+            element.set_source(source.into());
             (remain, vec![element])
         }
         Err(_) => {
@@ -86,26 +87,29 @@ pub fn dynamic_block<'r, 's>(
     Ok((
         remaining,
         DynamicBlock {
-            source,
-            name,
-            parameters,
+            source: source.into(),
+            name: name.into(),
+            parameters: parameters.map(|val| val.into()),
             children,
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn name<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+fn name<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     is_not(" \t\r\n")(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn parameters<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+fn parameters<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     is_not("\r\n")(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn dynamic_block_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn dynamic_block_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     let (remaining, source) = recognize(tuple((
         space0,
diff --git a/src/parser/element_parser.rs b/src/parser/element_parser.rs
index 11a2b45..d781a7a 100644
--- a/src/parser/element_parser.rs
+++ b/src/parser/element_parser.rs
@@ -19,6 +19,7 @@ use super::lesser_block::example_block;
 use super::lesser_block::export_block;
 use super::lesser_block::src_block;
 use super::lesser_block::verse_block;
+use super::org_source::OrgSource;
 use super::paragraph::paragraph;
 use super::plain_list::plain_list;
 use super::source::SetSource;
@@ -31,16 +32,16 @@ use crate::parser::table::org_mode_table;
 
 pub fn element(
     can_be_paragraph: bool,
-) -> impl for<'r, 's> Fn(Context<'r, 's>, &'s str) -> Res<&'s str, Element<'s>> {
-    move |context: Context, input: &str| _element(context, input, can_be_paragraph)
+) -> impl for<'r, 's> Fn(Context<'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, Element<'s>> {
+    move |context: Context, input: OrgSource<'_>| _element(context, input, can_be_paragraph)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn _element<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
+    input: OrgSource<'s>,
     can_be_paragraph: bool,
-) -> Res<&'s str, Element<'s>> {
+) -> Res<OrgSource<'s>, Element<'s>> {
     let plain_list_matcher = parser_with_context!(plain_list)(context);
     let greater_block_matcher = parser_with_context!(greater_block)(context);
     let dynamic_block_matcher = parser_with_context!(dynamic_block)(context);
@@ -103,7 +104,7 @@ fn _element<'r, 's>(
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
 
     let source = get_consumed(input, remaining);
-    element.set_source(source);
+    element.set_source(source.into());
 
     Ok((remaining, element))
 }
diff --git a/src/parser/entity.rs b/src/parser/entity.rs
index 6289505..c375d8e 100644
--- a/src/parser/entity.rs
+++ b/src/parser/entity.rs
@@ -7,6 +7,7 @@ use nom::combinator::eof;
 use nom::combinator::peek;
 use nom::combinator::recognize;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::object::Entity;
@@ -14,7 +15,10 @@ use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::get_consumed;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn entity<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Entity<'s>> {
+pub fn entity<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Entity<'s>> {
     let (remaining, _) = tag("\\")(input)?;
     let (remaining, entity_name) = name(context, remaining)?;
     let (remaining, _) = alt((
@@ -27,14 +31,17 @@ pub fn entity<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
     Ok((
         remaining,
         Entity {
-            source,
-            entity_name,
+            source: source.into(),
+            entity_name: entity_name.into(),
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn name<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn name<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     // TODO: This should be defined by org-entities and optionally org-entities-user
 
     // TODO: Add the rest of the entities, this is a very incomplete list
@@ -43,7 +50,7 @@ fn name<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s st
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn entity_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
+fn entity_end<'r, 's>(context: Context<'r, 's>, input: OrgSource<'s>) -> Res<OrgSource<'s>, ()> {
     let (remaining, _) = alt((eof, recognize(satisfy(|c| !c.is_alphabetic()))))(input)?;
 
     Ok((remaining, ()))
diff --git a/src/parser/export_snippet.rs b/src/parser/export_snippet.rs
index cfc0c53..c293eef 100644
--- a/src/parser/export_snippet.rs
+++ b/src/parser/export_snippet.rs
@@ -7,6 +7,7 @@ use nom::multi::many1;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::exiting::ExitClass;
@@ -20,8 +21,8 @@ use crate::parser::ExportSnippet;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn export_snippet<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, ExportSnippet<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, ExportSnippet<'s>> {
     let (remaining, _) = tag("@@")(input)?;
     let (remaining, backend_name) = backend(context, remaining)?;
     let parser_context =
@@ -38,15 +39,18 @@ pub fn export_snippet<'r, 's>(
     Ok((
         remaining,
         ExportSnippet {
-            source,
-            backend: backend_name,
-            contents: backend_contents.map(|(_colon, backend_contents)| backend_contents),
+            source: source.into(),
+            backend: backend_name.into(),
+            contents: backend_contents.map(|(_colon, backend_contents)| backend_contents.into()),
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn backend<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn backend<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, backend_name) =
         recognize(many1(verify(anychar, |c| c.is_alphanumeric() || *c == '-')))(input)?;
 
@@ -54,7 +58,10 @@ fn backend<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn contents<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn contents<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, source) = recognize(verify(
         many_till(anychar, parser_with_context!(exit_matcher_parser)(context)),
         |(children, _exit_contents)| !children.is_empty(),
@@ -63,6 +70,9 @@ fn contents<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn export_snippet_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn export_snippet_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     tag("@@")(input)
 }
diff --git a/src/parser/fixed_width_area.rs b/src/parser/fixed_width_area.rs
index 182dfec..068556d 100644
--- a/src/parser/fixed_width_area.rs
+++ b/src/parser/fixed_width_area.rs
@@ -11,6 +11,7 @@ use nom::multi::many0;
 use nom::sequence::preceded;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::parser_with_context::parser_with_context;
@@ -22,8 +23,8 @@ use crate::parser::FixedWidthArea;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn fixed_width_area<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, FixedWidthArea<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, FixedWidthArea<'s>> {
     let fixed_width_area_line_matcher = parser_with_context!(fixed_width_area_line)(context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(context);
     let (remaining, _first_line) = fixed_width_area_line_matcher(input)?;
@@ -31,14 +32,19 @@ pub fn fixed_width_area<'r, 's>(
         many0(preceded(not(exit_matcher), fixed_width_area_line_matcher))(remaining)?;
 
     let source = get_consumed(input, remaining);
-    Ok((remaining, FixedWidthArea { source }))
+    Ok((
+        remaining,
+        FixedWidthArea {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn fixed_width_area_line<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     let (remaining, _indent) = space0(input)?;
     let (remaining, (_hash, _leading_whitespace_and_content, _line_ending)) = tuple((
diff --git a/src/parser/footnote_definition.rs b/src/parser/footnote_definition.rs
index 775701f..738c324 100644
--- a/src/parser/footnote_definition.rs
+++ b/src/parser/footnote_definition.rs
@@ -10,6 +10,7 @@ use nom::multi::many1;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::util::WORD_CONSTITUENT_CHARACTERS;
 use super::Context;
 use crate::error::CustomError;
@@ -31,11 +32,11 @@ use crate::parser::util::start_of_line;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn footnote_definition<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, FootnoteDefinition<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, FootnoteDefinition<'s>> {
     if immediate_in_section(context, "footnote definition") {
         return Err(nom::Err::Error(CustomError::MyError(MyError(
-            "Cannot nest objects of the same element",
+            "Cannot nest objects of the same element".into(),
         ))));
     }
     start_of_line(context, input)?;
@@ -59,15 +60,15 @@ pub fn footnote_definition<'r, 's>(
     Ok((
         remaining,
         FootnoteDefinition {
-            source,
-            label: lbl,
+            source: source.into(),
+            label: lbl.into(),
             children,
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn label<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+pub fn label<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     alt((
         digit1,
         take_while(|c| WORD_CONSTITUENT_CHARACTERS.contains(c) || "-_".contains(c)),
@@ -77,8 +78,8 @@ pub fn label<'s>(input: &'s str) -> Res<&'s str, &'s str> {
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn footnote_definition_end<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let start_of_line_matcher = parser_with_context!(start_of_line)(context);
     let allow_nesting_context =
         context.with_additional_node(ContextElement::Context("allow nesting footnotes"));
@@ -98,7 +99,9 @@ fn footnote_definition_end<'r, 's>(
         ))),
         recognize(tuple((
             start_of_line_matcher,
-            verify(many1(blank_line), |lines: &Vec<&str>| lines.len() >= 2),
+            verify(many1(blank_line), |lines: &Vec<OrgSource<'_>>| {
+                lines.len() >= 2
+            }),
         ))),
     ))(input)?;
 
diff --git a/src/parser/footnote_reference.rs b/src/parser/footnote_reference.rs
index 5cb797e..10956a8 100644
--- a/src/parser/footnote_reference.rs
+++ b/src/parser/footnote_reference.rs
@@ -5,6 +5,7 @@ use nom::character::complete::space0;
 use nom::combinator::verify;
 use nom::multi::many_till;
 
+use super::org_source::OrgSource;
 use super::parser_context::ContextElement;
 use super::Context;
 use crate::error::CustomError;
@@ -24,8 +25,8 @@ use crate::parser::Object;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn footnote_reference<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, FootnoteReference<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, FootnoteReference<'s>> {
     alt((
         parser_with_context!(anonymous_footnote)(context),
         parser_with_context!(footnote_reference_only)(context),
@@ -36,8 +37,8 @@ pub fn footnote_reference<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn anonymous_footnote<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, FootnoteReference<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, FootnoteReference<'s>> {
     let (remaining, _) = tag_no_case("[fn::")(input)?;
     let parser_context = context
         .with_additional_node(ContextElement::FootnoteReferenceDefinition(
@@ -65,7 +66,7 @@ fn anonymous_footnote<'r, 's>(
     Ok((
         remaining,
         FootnoteReference {
-            source,
+            source: source.into(),
             label: None,
             definition: children,
         },
@@ -75,8 +76,8 @@ fn anonymous_footnote<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn inline_footnote<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, FootnoteReference<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, FootnoteReference<'s>> {
     let (remaining, _) = tag_no_case("[fn:")(input)?;
     let (remaining, label_contents) = label(remaining)?;
     let (remaining, _) = tag(":")(remaining)?;
@@ -106,8 +107,8 @@ fn inline_footnote<'r, 's>(
     Ok((
         remaining,
         FootnoteReference {
-            source,
-            label: Some(label_contents),
+            source: source.into(),
+            label: Some(label_contents.into()),
             definition: children,
         },
     ))
@@ -116,8 +117,8 @@ fn inline_footnote<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn footnote_reference_only<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, FootnoteReference<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, FootnoteReference<'s>> {
     let (remaining, _) = tag_no_case("[fn:")(input)?;
     let (remaining, label_contents) = label(remaining)?;
     let (remaining, _) = tag("]")(remaining)?;
@@ -126,28 +127,28 @@ fn footnote_reference_only<'r, 's>(
     Ok((
         remaining,
         FootnoteReference {
-            source,
-            label: Some(label_contents),
+            source: source.into(),
+            label: Some(label_contents.into()),
             definition: Vec::with_capacity(0),
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn definition<'s>(input: &'s str) -> Res<&'s str, Vec<Object<'s>>> {
+fn definition<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     Ok((input, vec![]))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn footnote_definition_end<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let context_depth = get_bracket_depth(context)
         .expect("This function should only be called from inside a footnote definition.");
     let text_since_context_entry = get_consumed(context_depth.position, input);
     let mut current_depth = context_depth.depth;
-    for c in text_since_context_entry.chars() {
+    for c in Into::<&str>::into(text_since_context_entry).chars() {
         match c {
             '[' => {
                 current_depth += 1;
@@ -164,7 +165,7 @@ fn footnote_definition_end<'r, 's>(
     if current_depth > 0 {
         // Its impossible for the next character to end the footnote reference definition if we're any amount of brackets deep
         return Err(nom::Err::Error(CustomError::MyError(MyError(
-            "NoFootnoteReferenceDefinitionEnd",
+            "NoFootnoteReferenceDefinitionEnd".into(),
         ))));
     }
     tag("]")(input)
diff --git a/src/parser/greater_block.rs b/src/parser/greater_block.rs
index 7164e9a..62c042c 100644
--- a/src/parser/greater_block.rs
+++ b/src/parser/greater_block.rs
@@ -11,6 +11,7 @@ use nom::combinator::verify;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
@@ -33,26 +34,28 @@ use crate::parser::Paragraph;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn greater_block<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, GreaterBlock<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, GreaterBlock<'s>> {
     // TODO: Do I need to differentiate between different greater block types.
     start_of_line(context, input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, (_begin, name)) = tuple((
         tag_no_case("#+begin_"),
-        verify(name, |name: &str| match name.to_lowercase().as_str() {
-            "comment" | "example" | "export" | "src" | "verse" => false,
-            _ => true,
+        verify(name, |name: &OrgSource<'_>| {
+            match Into::<&str>::into(name).to_lowercase().as_str() {
+                "comment" | "example" | "export" | "src" | "verse" => false,
+                _ => true,
+            }
         }),
     ))(remaining)?;
-    let context_name = match name.to_lowercase().as_str() {
+    let context_name = match Into::<&str>::into(name).to_lowercase().as_str() {
         "center" => "center block",
         "quote" => "quote block",
         _ => "greater block",
     };
     if immediate_in_section(context, context_name) {
         return Err(nom::Err::Error(CustomError::MyError(MyError(
-            "Cannot nest objects of the same element",
+            "Cannot nest objects of the same element".into(),
         ))));
     }
     let (remaining, parameters) = opt(tuple((space1, parameters)))(remaining)?;
@@ -60,7 +63,7 @@ pub fn greater_block<'r, 's>(
     let parser_context = context
         .with_additional_node(ContextElement::ConsumeTrailingWhitespace(true))
         .with_additional_node(ContextElement::Context(context_name))
-        .with_additional_node(ContextElement::GreaterBlock(name))
+        .with_additional_node(ContextElement::GreaterBlock(name.into()))
         .with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Alpha,
             exit_matcher: &greater_block_end,
@@ -80,9 +83,9 @@ pub fn greater_block<'r, 's>(
     ))(remaining)
     {
         Ok((remain, (_not_immediate_exit, first_line, (_trailing_whitespace, _exit_contents)))) => {
-            let mut element = Element::Paragraph(Paragraph::of_text(first_line));
+            let mut element = Element::Paragraph(Paragraph::of_text(first_line.into()));
             let source = get_consumed(remaining, remain);
-            element.set_source(source);
+            element.set_source(source.into());
             (remain, vec![element])
         }
         Err(_) => {
@@ -99,29 +102,32 @@ pub fn greater_block<'r, 's>(
     Ok((
         remaining,
         GreaterBlock {
-            source,
-            name,
-            parameters,
+            source: source.into(),
+            name: name.into(),
+            parameters: parameters.map(|val| Into::<&str>::into(val)),
             children,
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn name<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+fn name<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     is_not(" \t\r\n")(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn parameters<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+fn parameters<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     is_not("\r\n")(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn greater_block_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn greater_block_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     let current_name: &str = get_context_greater_block_name(context).ok_or(nom::Err::Error(
-        CustomError::MyError(MyError("Not inside a greater block")),
+        CustomError::MyError(MyError("Not inside a greater block".into())),
     ))?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, (_begin, _name, _ws)) = tuple((
diff --git a/src/parser/horizontal_rule.rs b/src/parser/horizontal_rule.rs
index 37fb99d..88aa468 100644
--- a/src/parser/horizontal_rule.rs
+++ b/src/parser/horizontal_rule.rs
@@ -8,6 +8,7 @@ use nom::combinator::verify;
 use nom::multi::many1_count;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::util::start_of_line;
@@ -16,8 +17,8 @@ use crate::parser::HorizontalRule;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn horizontal_rule<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, HorizontalRule<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, HorizontalRule<'s>> {
     start_of_line(context, input)?;
     let (remaining, rule) = recognize(tuple((
         space0,
@@ -25,5 +26,10 @@ pub fn horizontal_rule<'r, 's>(
         space0,
         alt((line_ending, eof)),
     )))(input)?;
-    Ok((remaining, HorizontalRule { source: rule }))
+    Ok((
+        remaining,
+        HorizontalRule {
+            source: rule.into(),
+        },
+    ))
 }
diff --git a/src/parser/inline_babel_call.rs b/src/parser/inline_babel_call.rs
index 4c412bf..3e25186 100644
--- a/src/parser/inline_babel_call.rs
+++ b/src/parser/inline_babel_call.rs
@@ -10,6 +10,7 @@ use nom::combinator::recognize;
 use nom::combinator::verify;
 use nom::multi::many_till;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::exiting::ExitClass;
@@ -24,8 +25,8 @@ use crate::parser::InlineBabelCall;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn inline_babel_call<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, InlineBabelCall<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, InlineBabelCall<'s>> {
     let (remaining, _) = tag_no_case("call_")(input)?;
     let (remaining, _name) = name(context, remaining)?;
     let (remaining, _header1) = opt(parser_with_context!(header)(context))(remaining)?;
@@ -33,11 +34,19 @@ pub fn inline_babel_call<'r, 's>(
     let (remaining, _header2) = opt(parser_with_context!(header)(context))(remaining)?;
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, InlineBabelCall { source }))
+    Ok((
+        remaining,
+        InlineBabelCall {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn name<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn name<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -51,12 +60,18 @@ fn name<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s st
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn name_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn name_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(one_of("[("))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn header<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn header<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _) = tag("[")(input)?;
 
     let parser_context = context
@@ -78,12 +93,15 @@ fn header<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn header_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn header_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let context_depth = get_bracket_depth(context)
         .expect("This function should only be called from inside an inline babel call header.");
     let text_since_context_entry = get_consumed(context_depth.position, input);
     let mut current_depth = context_depth.depth;
-    for c in text_since_context_entry.chars() {
+    for c in Into::<&str>::into(text_since_context_entry).chars() {
         match c {
             '(' => {
                 current_depth += 1;
@@ -101,7 +119,10 @@ fn header_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn argument<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn argument<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _) = tag("(")(input)?;
 
     let parser_context = context
@@ -123,12 +144,15 @@ fn argument<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn argument_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn argument_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let context_depth = get_bracket_depth(context)
         .expect("This function should only be called from inside an inline babel call argument.");
     let text_since_context_entry = get_consumed(context_depth.position, input);
     let mut current_depth = context_depth.depth;
-    for c in text_since_context_entry.chars() {
+    for c in Into::<&str>::into(text_since_context_entry).chars() {
         match c {
             '[' => {
                 current_depth += 1;
diff --git a/src/parser/inline_source_block.rs b/src/parser/inline_source_block.rs
index 1b71faf..0d7bef7 100644
--- a/src/parser/inline_source_block.rs
+++ b/src/parser/inline_source_block.rs
@@ -11,6 +11,7 @@ use nom::multi::many_till;
 #[cfg(feature = "tracing")]
 use tracing::span;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::Res;
@@ -26,19 +27,27 @@ use crate::parser::InlineSourceBlock;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn inline_source_block<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, InlineSourceBlock<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, InlineSourceBlock<'s>> {
     let (remaining, _) = tag_no_case("src_")(input)?;
     let (remaining, _) = lang(context, remaining)?;
     let (remaining, _header1) = opt(parser_with_context!(header)(context))(remaining)?;
     let (remaining, _body) = body(context, remaining)?;
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, InlineSourceBlock { source }))
+    Ok((
+        remaining,
+        InlineSourceBlock {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn lang<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn lang<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -52,12 +61,18 @@ fn lang<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s st
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn lang_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn lang_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(one_of("[{"))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn header<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn header<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _) = tag("[")(input)?;
 
     let parser_context = context
@@ -81,12 +96,15 @@ fn header<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn header_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn header_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let context_depth = get_bracket_depth(context)
         .expect("This function should only be called from inside an inline source block header.");
     let text_since_context_entry = get_consumed(context_depth.position, input);
     let mut current_depth = context_depth.depth;
-    for c in text_since_context_entry.chars() {
+    for c in Into::<&str>::into(text_since_context_entry).chars() {
         match c {
             '[' => {
                 current_depth += 1;
@@ -101,7 +119,7 @@ fn header_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
         }
     }
     if current_depth == 0 {
-        let close_bracket = tag::<&str, &str, CustomError<&str>>("]")(input);
+        let close_bracket = tag::<&str, OrgSource<'_>, CustomError<OrgSource<'_>>>("]")(input);
         if close_bracket.is_ok() {
             return close_bracket;
         }
@@ -111,7 +129,10 @@ fn header_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn body<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn body<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _) = tag("{")(input)?;
 
     let parser_context = context
@@ -145,12 +166,15 @@ fn body<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s st
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn body_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn body_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let context_depth = get_bracket_depth(context)
         .expect("This function should only be called from inside an inline source block body.");
     let text_since_context_entry = get_consumed(context_depth.position, input);
     let mut current_depth = context_depth.depth;
-    for c in text_since_context_entry.chars() {
+    for c in Into::<&str>::into(text_since_context_entry).chars() {
         match c {
             '{' => {
                 current_depth += 1;
@@ -176,7 +200,7 @@ fn body_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'
         let _enter = span.enter();
 
         if current_depth == 0 {
-            let close_bracket = tag::<&str, &str, CustomError<&str>>("}")(input);
+            let close_bracket = tag::<&str, OrgSource<'_>, CustomError<OrgSource<'_>>>("}")(input);
             if close_bracket.is_ok() {
                 return close_bracket;
             }
diff --git a/src/parser/keyword.rs b/src/parser/keyword.rs
index d5a33e6..8114660 100644
--- a/src/parser/keyword.rs
+++ b/src/parser/keyword.rs
@@ -11,13 +11,17 @@ use nom::combinator::peek;
 use nom::combinator::recognize;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::util::start_of_line;
 use crate::parser::Keyword;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn keyword<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Keyword<'s>> {
+pub fn keyword<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Keyword<'s>> {
     start_of_line(context, input)?;
     // TODO: When key is a member of org-element-parsed-keywords, value can contain the standard set objects, excluding footnote references.
     let (remaining, rule) = recognize(tuple((
@@ -30,5 +34,10 @@ pub fn keyword<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
         alt((recognize(tuple((space1, is_not("\r\n")))), space0)),
         alt((line_ending, eof)),
     )))(input)?;
-    Ok((remaining, Keyword { source: rule }))
+    Ok((
+        remaining,
+        Keyword {
+            source: rule.into(),
+        },
+    ))
 }
diff --git a/src/parser/latex_environment.rs b/src/parser/latex_environment.rs
index fc90b18..84195c7 100644
--- a/src/parser/latex_environment.rs
+++ b/src/parser/latex_environment.rs
@@ -11,6 +11,7 @@ use nom::combinator::recognize;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::util::get_consumed;
 use super::Context;
 use crate::error::Res;
@@ -25,8 +26,8 @@ use crate::parser::LatexEnvironment;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn latex_environment<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, LatexEnvironment<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, LatexEnvironment<'s>> {
     start_of_line(context, input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, (_opening, name, _open_close_brace, _ws, _line_ending)) = tuple((
@@ -37,7 +38,7 @@ pub fn latex_environment<'r, 's>(
         line_ending,
     ))(remaining)?;
 
-    let latex_environment_end_specialized = latex_environment_end(name);
+    let latex_environment_end_specialized = latex_environment_end(name.into());
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -48,11 +49,16 @@ pub fn latex_environment<'r, 's>(
     let (remaining, _end) = latex_environment_end_specialized(&parser_context, remaining)?;
 
     let source = get_consumed(input, remaining);
-    Ok((remaining, LatexEnvironment { source }))
+    Ok((
+        remaining,
+        LatexEnvironment {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn name<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+fn name<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     take_while1(|c: char| c.is_alphanumeric() || c == '*')(input)
 }
 
@@ -60,11 +66,15 @@ fn name<'s>(input: &'s str) -> Res<&'s str, &'s str> {
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(end_matcher))
 )]
-pub fn contents<'r, 's, F: Fn(Context<'r, 's>, &'s str) -> Res<&'s str, &'s str>>(
+pub fn contents<
+    'r,
+    's,
+    F: Fn(Context<'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>>,
+>(
     end_matcher: F,
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, source) = recognize(many_till(
         anychar,
         peek(alt((
@@ -78,9 +88,9 @@ pub fn contents<'r, 's, F: Fn(Context<'r, 's>, &'s str) -> Res<&'s str, &'s str>
 
 fn latex_environment_end(
     current_name: &str,
-) -> impl for<'r, 's> Fn(Context<'r, 's>, &'s str) -> Res<&'s str, &'s str> {
+) -> impl for<'r, 's> Fn(Context<'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let current_name_lower = current_name.to_lowercase();
-    move |context: Context, input: &str| {
+    move |context: Context, input: OrgSource<'_>| {
         _latex_environment_end(context, input, current_name_lower.as_str())
     }
 }
@@ -88,9 +98,9 @@ fn latex_environment_end(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn _latex_environment_end<'r, 's, 'x>(
     context: Context<'r, 's>,
-    input: &'s str,
+    input: OrgSource<'s>,
     current_name_lower: &'x str,
-) -> Res<&'s str, &'s str> {
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, (_begin, _name, _close_brace, _ws, _line_ending)) = tuple((
diff --git a/src/parser/latex_fragment.rs b/src/parser/latex_fragment.rs
index 71f7b7c..75073eb 100644
--- a/src/parser/latex_fragment.rs
+++ b/src/parser/latex_fragment.rs
@@ -13,6 +13,7 @@ use nom::multi::many0;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
@@ -26,8 +27,8 @@ use crate::parser::LatexFragment;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn latex_fragment<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, LatexFragment<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, LatexFragment<'s>> {
     let (remaining, _) = alt((
         parser_with_context!(raw_latex_fragment)(context),
         parser_with_context!(escaped_parenthesis_fragment)(context),
@@ -38,11 +39,19 @@ pub fn latex_fragment<'r, 's>(
     ))(input)?;
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, LatexFragment { source }))
+    Ok((
+        remaining,
+        LatexFragment {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn raw_latex_fragment<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn raw_latex_fragment<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _) = tag("\\")(input)?;
     let (remaining, _) = name(context, remaining)?;
     let (remaining, _) = many0(parser_with_context!(brackets)(context))(remaining)?;
@@ -52,12 +61,18 @@ fn raw_latex_fragment<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn name<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn name<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     alpha1(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn brackets<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn brackets<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, body) = alt((
         recognize(tuple((
             tag("["),
@@ -88,8 +103,8 @@ fn brackets<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn escaped_parenthesis_fragment<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _) = tag("\\(")(input)?;
     let (remaining, _) = recognize(many_till(
         anychar,
@@ -107,8 +122,8 @@ fn escaped_parenthesis_fragment<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn escaped_bracket_fragment<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _) = tag("\\[")(input)?;
     let (remaining, _) = recognize(many_till(
         anychar,
@@ -126,8 +141,8 @@ fn escaped_bracket_fragment<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn double_dollar_fragment<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     // TODO: The documentation on the dollar sign versions is incomplete. Test to figure out what the real requirements are. For example, can this span more than 3 lines and can this contain a single $ since its terminated by $$?
     let (remaining, _) = tag("$$")(input)?;
     let (remaining, _) = recognize(many_till(
@@ -144,7 +159,10 @@ fn double_dollar_fragment<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn dollar_char_fragment<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn dollar_char_fragment<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (_, _) = pre(context, input)?;
     let (remaining, _) = tag("$")(input)?;
     let (remaining, _) = verify(none_of(".,?;\""), |c| !c.is_whitespace())(remaining)?;
@@ -156,21 +174,21 @@ fn dollar_char_fragment<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
+pub fn pre<'r, 's>(context: Context<'r, 's>, input: OrgSource<'s>) -> Res<OrgSource<'s>, ()> {
     let document_root = context.get_document_root().unwrap();
     let preceding_character = get_one_before(document_root, input)
         .map(|slice| slice.chars().next())
         .flatten();
     if let Some('$') = preceding_character {
         return Err(nom::Err::Error(CustomError::MyError(MyError(
-            "Not a valid pre character for dollar char fragment.",
+            "Not a valid pre character for dollar char fragment.".into(),
         ))));
     }
     Ok((input, ()))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn post<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
+pub fn post<'r, 's>(context: Context<'r, 's>, input: OrgSource<'s>) -> Res<OrgSource<'s>, ()> {
     // TODO: What about eof? Test to find out.
 
     // TODO: Figure out which punctuation characters should be included.
@@ -181,8 +199,8 @@ pub fn post<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn bordered_dollar_fragment<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (_, _) = pre(context, input)?;
     let (remaining, _) = tag("$")(input)?;
     // TODO: I'm assuming I should be peeking at the borders but the documentation is not clear. Test to figure out.
@@ -197,7 +215,7 @@ fn bordered_dollar_fragment<'r, 's>(
                 tag("$"),
             ))),
         )),
-        |body: &str| body.lines().take(4).count() <= 3,
+        |body: &OrgSource<'_>| Into::<&str>::into(body).lines().take(4).count() <= 3,
     )(remaining)?;
 
     let (_, _) = peek(parser_with_context!(close_border)(context))(remaining)?;
@@ -209,12 +227,18 @@ fn bordered_dollar_fragment<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn open_border<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+pub fn open_border<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(verify(none_of(".,;$"), |c| !c.is_whitespace()))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn close_border<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
+pub fn close_border<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, ()> {
     let document_root = context.get_document_root().unwrap();
     let preceding_character = get_one_before(document_root, input)
         .map(|slice| slice.chars().next())
@@ -223,7 +247,7 @@ pub fn close_border<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s
         Some(c) if !c.is_whitespace() && !".,;$".contains(c) => Ok((input, ())),
         _ => {
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "Not a valid pre character for dollar char fragment.",
+                "Not a valid pre character for dollar char fragment.".into(),
             ))));
         }
     }
diff --git a/src/parser/lesser_block.rs b/src/parser/lesser_block.rs
index 42a1feb..7a60c6c 100644
--- a/src/parser/lesser_block.rs
+++ b/src/parser/lesser_block.rs
@@ -11,6 +11,7 @@ use nom::combinator::verify;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::exiting::ExitClass;
@@ -34,8 +35,8 @@ use crate::parser::util::text_until_exit;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn verse_block<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, VerseBlock<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, VerseBlock<'s>> {
     let (remaining, name) = lesser_block_begin("verse")(context, input)?;
     let (remaining, parameters) = opt(tuple((space1, data)))(remaining)?;
     let (remaining, _nl) = line_ending(remaining)?;
@@ -58,7 +59,9 @@ pub fn verse_block<'r, 's>(
     let (remaining, children) = match consumed(many_till(blank_line, exit_matcher))(remaining) {
         Ok((remaining, (whitespace, (_children, _exit_contents)))) => (
             remaining,
-            vec![Object::PlainText(PlainText { source: whitespace })],
+            vec![Object::PlainText(PlainText {
+                source: whitespace.into(),
+            })],
         ),
         Err(_) => {
             let (remaining, (children, _exit_contents)) =
@@ -72,9 +75,9 @@ pub fn verse_block<'r, 's>(
     Ok((
         remaining,
         VerseBlock {
-            source,
-            name,
-            data: parameters,
+            source: source.into(),
+            name: name.into(),
+            data: parameters.map(|parameters| Into::<&str>::into(parameters)),
             children,
         },
     ))
@@ -83,8 +86,8 @@ pub fn verse_block<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn comment_block<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, CommentBlock<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, CommentBlock<'s>> {
     let (remaining, name) = lesser_block_begin("comment")(context, input)?;
     let (remaining, parameters) = opt(tuple((space1, data)))(remaining)?;
     let (remaining, _nl) = line_ending(remaining)?;
@@ -108,10 +111,10 @@ pub fn comment_block<'r, 's>(
     Ok((
         remaining,
         CommentBlock {
-            source,
-            name,
-            data: parameters,
-            contents,
+            source: source.into(),
+            name: name.into(),
+            data: parameters.map(|parameters| Into::<&str>::into(parameters)),
+            contents: contents.into(),
         },
     ))
 }
@@ -119,8 +122,8 @@ pub fn comment_block<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn example_block<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, ExampleBlock<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, ExampleBlock<'s>> {
     let (remaining, name) = lesser_block_begin("example")(context, input)?;
     let (remaining, parameters) = opt(tuple((space1, data)))(remaining)?;
     let (remaining, _nl) = line_ending(remaining)?;
@@ -144,10 +147,10 @@ pub fn example_block<'r, 's>(
     Ok((
         remaining,
         ExampleBlock {
-            source,
-            name,
-            data: parameters,
-            contents,
+            source: source.into(),
+            name: source.into(),
+            data: parameters.map(|parameters| Into::<&str>::into(parameters)),
+            contents: contents.into(),
         },
     ))
 }
@@ -155,8 +158,8 @@ pub fn example_block<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn export_block<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, ExportBlock<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, ExportBlock<'s>> {
     let (remaining, name) = lesser_block_begin("export")(context, input)?;
     // https://orgmode.org/worg/org-syntax.html#Blocks claims that export blocks must have a single word for data but testing shows no data and multi-word data still parses as an export block.
     let (remaining, parameters) = opt(tuple((space1, data)))(remaining)?;
@@ -181,16 +184,19 @@ pub fn export_block<'r, 's>(
     Ok((
         remaining,
         ExportBlock {
-            source,
-            name,
-            data: parameters,
-            contents,
+            source: source.into(),
+            name: name.into(),
+            data: parameters.map(|parameters| Into::<&str>::into(parameters)),
+            contents: contents.into(),
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn src_block<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, SrcBlock<'s>> {
+pub fn src_block<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, SrcBlock<'s>> {
     let (remaining, name) = lesser_block_begin("src")(context, input)?;
     // https://orgmode.org/worg/org-syntax.html#Blocks claims that data is mandatory and must follow the LANGUAGE SWITCHES ARGUMENTS pattern but testing has shown that no data and incorrect data here will still parse to a src block.
     let (remaining, parameters) = opt(tuple((space1, data)))(remaining)?;
@@ -215,29 +221,29 @@ pub fn src_block<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s st
     Ok((
         remaining,
         SrcBlock {
-            source,
-            name,
-            data: parameters,
-            contents,
+            source: source.into(),
+            name: name.into(),
+            data: parameters.map(|parameters| Into::<&str>::into(parameters)),
+            contents: contents.into(),
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn name<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+fn name<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     is_not(" \t\r\n")(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn data<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+fn data<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     is_not("\r\n")(input)
 }
 
 fn lesser_block_end(
     current_name: &str,
-) -> impl for<'r, 's> Fn(Context<'r, 's>, &'s str) -> Res<&'s str, &'s str> {
+) -> impl for<'r, 's> Fn(Context<'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let current_name_lower = current_name.to_lowercase();
-    move |context: Context, input: &str| {
+    move |context: Context, input: OrgSource<'_>| {
         _lesser_block_end(context, input, current_name_lower.as_str())
     }
 }
@@ -245,9 +251,9 @@ fn lesser_block_end(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn _lesser_block_end<'r, 's, 'x>(
     context: Context<'r, 's>,
-    input: &'s str,
+    input: OrgSource<'s>,
     current_name_lower: &'x str,
-) -> Res<&'s str, &'s str> {
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, (_begin, _name, _ws)) = tuple((
@@ -261,9 +267,9 @@ fn _lesser_block_end<'r, 's, 'x>(
 
 fn lesser_block_begin(
     current_name: &str,
-) -> impl for<'r, 's> Fn(Context<'r, 's>, &'s str) -> Res<&'s str, &'s str> {
+) -> impl for<'r, 's> Fn(Context<'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let current_name_lower = current_name.to_lowercase();
-    move |context: Context, input: &str| {
+    move |context: Context, input: OrgSource<'_>| {
         _lesser_block_begin(context, input, current_name_lower.as_str())
     }
 }
@@ -271,15 +277,15 @@ fn lesser_block_begin(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn _lesser_block_begin<'r, 's, 'x>(
     context: Context<'r, 's>,
-    input: &'s str,
+    input: OrgSource<'s>,
     current_name_lower: &'x str,
-) -> Res<&'s str, &'s str> {
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, (_begin, name)) = tuple((
         tag_no_case("#+begin_"),
-        verify(name, |name: &str| {
-            name.to_lowercase().as_str() == current_name_lower
+        verify(name, |name: &OrgSource<'_>| {
+            Into::<&str>::into(name).to_lowercase().as_str() == current_name_lower
         }),
     ))(remaining)?;
     Ok((remaining, name))
diff --git a/src/parser/line_break.rs b/src/parser/line_break.rs
index 635fd6b..6d359e5 100644
--- a/src/parser/line_break.rs
+++ b/src/parser/line_break.rs
@@ -4,6 +4,7 @@ use nom::character::complete::one_of;
 use nom::combinator::recognize;
 use nom::multi::many0;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
@@ -14,17 +15,25 @@ use crate::parser::util::get_one_before;
 use crate::parser::LineBreak;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn line_break<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, LineBreak<'s>> {
+pub fn line_break<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, LineBreak<'s>> {
     let (remaining, _) = pre(context, input)?;
     let (remaining, _) = tag(r#"\\"#)(remaining)?;
     let (remaining, _) = recognize(many0(one_of(" \t")))(remaining)?;
     let (remaining, _) = line_ending(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, LineBreak { source }))
+    Ok((
+        remaining,
+        LineBreak {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
+fn pre<'r, 's>(context: Context<'r, 's>, input: OrgSource<'s>) -> Res<OrgSource<'s>, ()> {
     let document_root = context.get_document_root().unwrap();
     let preceding_character = get_one_before(document_root, input)
         .map(|slice| slice.chars().next())
@@ -33,7 +42,7 @@ fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
         // If None, we are at the start of the file
         None | Some('\\') => {
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "Not a valid pre character for line break.",
+                "Not a valid pre character for line break.".into(),
             ))));
         }
         _ => {}
@@ -41,16 +50,16 @@ fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
     let current_line = get_current_line_before_position(document_root, input);
     match current_line {
         Some(line) => {
-            let is_non_empty_line = line.chars().any(|c| !c.is_whitespace());
+            let is_non_empty_line = Into::<&str>::into(line).chars().any(|c| !c.is_whitespace());
             if !is_non_empty_line {
                 return Err(nom::Err::Error(CustomError::MyError(MyError(
-                    "Not a valid pre line for line break.",
+                    "Not a valid pre line for line break.".into(),
                 ))));
             }
         }
         None => {
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "No preceding line for line break.",
+                "No preceding line for line break.".into(),
             ))));
         }
     }
diff --git a/src/parser/object_parser.rs b/src/parser/object_parser.rs
index 3176a60..37973a1 100644
--- a/src/parser/object_parser.rs
+++ b/src/parser/object_parser.rs
@@ -2,6 +2,7 @@ use nom::branch::alt;
 use nom::combinator::map;
 use nom::combinator::not;
 
+use super::org_source::OrgSource;
 use super::parser_with_context::parser_with_context;
 use super::plain_text::plain_text;
 use super::regular_link::regular_link;
@@ -31,8 +32,8 @@ use crate::parser::timestamp::timestamp;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn standard_set_object<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Object<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Object<'s>> {
     not(|i| context.check_exit_matcher(i))(input)?;
 
     alt((
@@ -90,8 +91,8 @@ pub fn standard_set_object<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn minimal_set_object<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Object<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Object<'s>> {
     not(|i| context.check_exit_matcher(i))(input)?;
 
     alt((
@@ -113,8 +114,8 @@ pub fn minimal_set_object<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn any_object_except_plain_text<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Object<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Object<'s>> {
     // Used for exit matchers so this does not check exit matcher condition.
     alt((
         map(parser_with_context!(timestamp)(context), Object::Timestamp),
@@ -170,8 +171,8 @@ pub fn any_object_except_plain_text<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn regular_link_description_object_set<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Object<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Object<'s>> {
     // TODO: It can also contain another link, but only when it is a plain or angle link. It can contain square brackets, but not ]]
     alt((
         map(
diff --git a/src/parser/org_macro.rs b/src/parser/org_macro.rs
index 6a14d6e..e3a66a7 100644
--- a/src/parser/org_macro.rs
+++ b/src/parser/org_macro.rs
@@ -7,6 +7,7 @@ use nom::combinator::verify;
 use nom::multi::many0;
 use nom::multi::separated_list0;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::object::OrgMacro;
@@ -15,7 +16,10 @@ use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn org_macro<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, OrgMacro<'s>> {
+pub fn org_macro<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgMacro<'s>> {
     let (remaining, _) = tag("{{{")(input)?;
     let (remaining, macro_name) = org_macro_name(context, remaining)?;
     let (remaining, macro_args) = opt(parser_with_context!(org_macro_args)(context))(remaining)?;
@@ -25,15 +29,22 @@ pub fn org_macro<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s st
     Ok((
         remaining,
         OrgMacro {
-            source,
-            macro_name,
-            macro_args: macro_args.unwrap_or_else(|| Vec::with_capacity(0)),
+            source: source.into(),
+            macro_name: macro_name.into(),
+            macro_args: macro_args
+                .unwrap_or_else(|| Vec::with_capacity(0))
+                .into_iter()
+                .map(|arg| arg.into())
+                .collect(),
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn org_macro_name<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn org_macro_name<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _) = verify(anychar, |c| c.is_alphabetic())(input)?;
     let (remaining, _) = many0(verify(anychar, |c| {
         c.is_alphanumeric() || *c == '-' || *c == '_'
@@ -43,7 +54,10 @@ fn org_macro_name<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn org_macro_args<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Vec<&'s str>> {
+fn org_macro_args<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Vec<OrgSource<'s>>> {
     let (remaining, _) = tag("(")(input)?;
     let (remaining, args) =
         separated_list0(tag(","), parser_with_context!(org_macro_arg)(context))(remaining)?;
@@ -53,7 +67,10 @@ fn org_macro_args<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn org_macro_arg<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn org_macro_arg<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let mut remaining = input;
     let mut escaping: bool = false;
     loop {
diff --git a/src/parser/org_source.rs b/src/parser/org_source.rs
index b765366..a3ac2ac 100644
--- a/src/parser/org_source.rs
+++ b/src/parser/org_source.rs
@@ -8,6 +8,9 @@ use nom::InputTakeAtPosition;
 use nom::Offset;
 use nom::Slice;
 
+use crate::error::CustomError;
+use crate::error::MyError;
+
 #[derive(Debug, Copy, Clone)]
 pub struct OrgSource<'s> {
     full_source: &'s str,
@@ -34,6 +37,10 @@ impl<'s> OrgSource<'s> {
         let start = self.preceding_line_break.unwrap_or(0);
         &self.full_source[start..self.start]
     }
+
+    pub fn len(&self) -> usize {
+        self.end - self.start
+    }
 }
 
 impl<'s> InputTake for OrgSource<'s> {
@@ -68,6 +75,12 @@ impl<'s> From<&OrgSource<'s>> for &'s str {
     }
 }
 
+impl<'s> From<OrgSource<'s>> for &'s str {
+    fn from(value: OrgSource<'s>) -> Self {
+        &value.full_source[value.start..value.end]
+    }
+}
+
 impl<'s, R> Slice<R> for OrgSource<'s>
 where
     R: RangeBounds<usize>,
@@ -217,6 +230,29 @@ impl<'s> InputTakeAtPosition for OrgSource<'s> {
     }
 }
 
+pub fn convert_error(err: nom::Err<CustomError<OrgSource<'_>>>) -> nom::Err<CustomError<&str>> {
+    match err {
+        nom::Err::Incomplete(needed) => nom::Err::Incomplete(needed),
+        nom::Err::Error(err) => nom::Err::Error(err.into()),
+        nom::Err::Failure(err) => nom::Err::Failure(err.into()),
+    }
+}
+
+impl<'s> From<CustomError<OrgSource<'s>>> for CustomError<&'s str> {
+    fn from(value: CustomError<OrgSource<'s>>) -> Self {
+        match value {
+            CustomError::MyError(err) => CustomError::MyError(err.into()),
+            CustomError::Nom(input, error_kind) => CustomError::Nom(input.into(), error_kind),
+        }
+    }
+}
+
+impl<'s> From<MyError<OrgSource<'s>>> for MyError<&'s str> {
+    fn from(value: MyError<OrgSource<'s>>) -> Self {
+        MyError(value.0.into())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/parser/paragraph.rs b/src/parser/paragraph.rs
index 4ce08c4..65f11b7 100644
--- a/src/parser/paragraph.rs
+++ b/src/parser/paragraph.rs
@@ -7,6 +7,7 @@ use nom::multi::many_till;
 use nom::sequence::tuple;
 
 use super::lesser_element::Paragraph;
+use super::org_source::OrgSource;
 use super::util::blank_line;
 use super::util::get_consumed;
 use super::Context;
@@ -21,7 +22,10 @@ use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::start_of_line;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn paragraph<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Paragraph<'s>> {
+pub fn paragraph<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Paragraph<'s>> {
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -39,11 +43,20 @@ pub fn paragraph<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s st
 
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, Paragraph { source, children }))
+    Ok((
+        remaining,
+        Paragraph {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn paragraph_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn paragraph_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let non_paragraph_element_matcher = parser_with_context!(element(false))(context);
     let start_of_line_matcher = parser_with_context!(start_of_line)(&context);
     alt((
diff --git a/src/parser/parser_context.rs b/src/parser/parser_context.rs
index f0ff27e..7001072 100644
--- a/src/parser/parser_context.rs
+++ b/src/parser/parser_context.rs
@@ -5,6 +5,7 @@ use nom::IResult;
 
 use super::list::List;
 use super::list::Node;
+use super::org_source::OrgSource;
 use super::Context;
 use super::Object;
 use crate::error::CustomError;
@@ -12,7 +13,8 @@ use crate::error::MyError;
 use crate::error::Res;
 use crate::parser::exiting::ExitClass;
 
-type Matcher = dyn for<'r, 's> Fn(Context<'r, 's>, &'s str) -> Res<&'s str, &'s str>;
+type Matcher =
+    dyn for<'r, 's> Fn(Context<'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>>;
 
 #[derive(Debug, Clone)]
 pub struct ContextTree<'r, 's> {
@@ -47,8 +49,8 @@ impl<'r, 's> ContextTree<'r, 's> {
     #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
     pub fn check_exit_matcher(
         &'r self,
-        i: &'s str,
-    ) -> IResult<&'s str, &'s str, CustomError<&'s str>> {
+        i: OrgSource<'s>,
+    ) -> IResult<OrgSource<'s>, OrgSource<'s>, CustomError<OrgSource<'s>>> {
         // Special check for EOF. We don't just make this a document-level exit matcher since the IgnoreParent ChainBehavior could cause early exit matchers to not run.
         let at_end_of_file = eof(i);
         if at_end_of_file.is_ok() {
@@ -78,7 +80,9 @@ impl<'r, 's> ContextTree<'r, 's> {
             };
         }
         // TODO: Make this a specific error instead of just a generic MyError
-        return Err(nom::Err::Error(CustomError::MyError(MyError("NoExit"))));
+        return Err(nom::Err::Error(CustomError::MyError(MyError(
+            "NoExit".into(),
+        ))));
     }
 
     pub fn get_document_root(&self) -> Option<&'s str> {
@@ -215,31 +219,31 @@ pub struct ExitMatcherNode<'r> {
 
 #[derive(Debug)]
 pub struct FootnoteReferenceDefinition<'s> {
-    pub position: &'s str,
+    pub position: OrgSource<'s>,
     pub depth: usize,
 }
 
 #[derive(Debug)]
 pub struct CitationBracket<'s> {
-    pub position: &'s str,
+    pub position: OrgSource<'s>,
     pub depth: usize,
 }
 
 #[derive(Debug)]
 pub struct BabelHeaderBracket<'s> {
-    pub position: &'s str,
+    pub position: OrgSource<'s>,
     pub depth: usize,
 }
 
 #[derive(Debug)]
 pub struct InlineSourceBlockBracket<'s> {
-    pub position: &'s str,
+    pub position: OrgSource<'s>,
     pub depth: usize,
 }
 
 #[derive(Debug)]
 pub struct SubscriptSuperscriptBrace<'s> {
-    pub position: &'s str,
+    pub position: OrgSource<'s>,
     pub depth: usize,
 }
 
diff --git a/src/parser/plain_link.rs b/src/parser/plain_link.rs
index 3882219..8c99a5d 100644
--- a/src/parser/plain_link.rs
+++ b/src/parser/plain_link.rs
@@ -9,6 +9,7 @@ use nom::combinator::peek;
 use nom::combinator::recognize;
 use nom::multi::many_till;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
@@ -24,7 +25,10 @@ use crate::parser::util::get_one_before;
 use crate::parser::util::WORD_CONSTITUENT_CHARACTERS;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn plain_link<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, PlainLink<'s>> {
+pub fn plain_link<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, PlainLink<'s>> {
     let (remaining, _) = pre(context, input)?;
     let (remaining, proto) = protocol(context, remaining)?;
     let (remaining, _separator) = tag(":")(remaining)?;
@@ -34,15 +38,15 @@ pub fn plain_link<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
     Ok((
         remaining,
         PlainLink {
-            source,
-            link_type: proto,
-            path,
+            source: source.into(),
+            link_type: proto.into(),
+            path: path.into(),
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
+fn pre<'r, 's>(context: Context<'r, 's>, input: OrgSource<'s>) -> Res<OrgSource<'s>, ()> {
     let document_root = context.get_document_root().unwrap();
     let preceding_character = get_one_before(document_root, input)
         .map(|slice| slice.chars().next())
@@ -54,7 +58,7 @@ fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
         Some(_) => {
             // Not at start of line, cannot be a heading
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "Not a valid pre character for plain link.",
+                "Not a valid pre character for plain link.".into(),
             ))));
         }
     };
@@ -62,13 +66,16 @@ fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn post<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
+fn post<'r, 's>(context: Context<'r, 's>, input: OrgSource<'s>) -> Res<OrgSource<'s>, ()> {
     let (remaining, _) = alt((eof, recognize(none_of(WORD_CONSTITUENT_CHARACTERS))))(input)?;
     Ok((remaining, ()))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn protocol<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+pub fn protocol<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     // TODO: This should be defined by org-link-parameters
     let (remaining, proto) = alt((
         alt((
@@ -103,7 +110,10 @@ pub fn protocol<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn path_plain<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn path_plain<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     // TODO: "optionally containing parenthesis-wrapped non-whitespace non-bracket substrings up to a depth of two. The string must end with either a non-punctation non-whitespace character, a forwards slash, or a parenthesis-wrapped substring"
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
@@ -118,6 +128,9 @@ fn path_plain<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn path_plain_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn path_plain_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(one_of(" \t\r\n()[]<>"))(input)
 }
diff --git a/src/parser/plain_list.rs b/src/parser/plain_list.rs
index 1990bab..b3edfae 100644
--- a/src/parser/plain_list.rs
+++ b/src/parser/plain_list.rs
@@ -15,6 +15,7 @@ use nom::sequence::tuple;
 
 use super::greater_element::PlainList;
 use super::greater_element::PlainListItem;
+use super::org_source::OrgSource;
 use super::parser_with_context::parser_with_context;
 use super::util::non_whitespace_character;
 use super::Context;
@@ -32,7 +33,10 @@ use crate::parser::util::maybe_consume_trailing_whitespace_if_not_exiting;
 use crate::parser::util::start_of_line;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn plain_list<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, PlainList<'s>> {
+pub fn plain_list<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, PlainList<'s>> {
     let parser_context = context
         .with_additional_node(ContextElement::Context("plain list"))
         .with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
@@ -76,7 +80,7 @@ pub fn plain_list<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
         Some(final_child) => final_child,
         None => {
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "Plain lists require at least one element.",
+                "Plain lists require at least one element.".into(),
             ))));
         }
     };
@@ -93,7 +97,7 @@ pub fn plain_list<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
     Ok((
         remaining,
         PlainList {
-            source,
+            source: source.into(),
             children: children.into_iter().map(|(_start, item)| item).collect(),
         },
     ))
@@ -102,25 +106,27 @@ pub fn plain_list<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn plain_list_item<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, PlainListItem<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, PlainListItem<'s>> {
     start_of_line(context, input)?;
     let (remaining, leading_whitespace) = space0(input)?;
     // It is fine that we get the indent level using the number of bytes rather than the number of characters because nom's space0 only matches space and tab (0x20 and 0x09)
     let indent_level = leading_whitespace.len();
-    let (remaining, bull) =
-        verify(bullet, |bull: &str| bull != "*" || indent_level > 0)(remaining)?;
+    let (remaining, bull) = verify(bullet, |bull: &OrgSource<'_>| {
+        Into::<&str>::into(bull) != "*" || indent_level > 0
+    })(remaining)?;
 
-    let maybe_contentless_item: Res<&str, &str> = alt((eof, line_ending))(remaining);
+    let maybe_contentless_item: Res<OrgSource<'_>, OrgSource<'_>> =
+        alt((eof, line_ending))(remaining);
     match maybe_contentless_item {
         Ok((rem, _ws)) => {
             let source = get_consumed(input, rem);
             return Ok((
                 rem,
                 PlainListItem {
-                    source,
+                    source: source.into(),
                     indentation: indent_level,
-                    bullet: bull,
+                    bullet: bull.into(),
                     children: Vec::new(),
                 },
             ));
@@ -152,16 +158,16 @@ pub fn plain_list_item<'r, 's>(
     return Ok((
         remaining,
         PlainListItem {
-            source,
+            source: source.into(),
             indentation: indent_level,
-            bullet: bull,
+            bullet: bull.into(),
             children,
         },
     ));
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn bullet<'s>(i: &'s str) -> Res<&'s str, &'s str> {
+fn bullet<'s>(i: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     alt((
         tag("*"),
         tag("-"),
@@ -171,21 +177,29 @@ fn bullet<'s>(i: &'s str) -> Res<&'s str, &'s str> {
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn counter<'s>(i: &'s str) -> Res<&'s str, &'s str> {
+fn counter<'s>(i: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     alt((recognize(one_of("abcdefghijklmnopqrstuvwxyz")), digit1))(i)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn plain_list_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn plain_list_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let start_of_line_matcher = parser_with_context!(start_of_line)(context);
     recognize(tuple((
         start_of_line_matcher,
-        verify(many1(blank_line), |lines: &Vec<&str>| lines.len() >= 2),
+        verify(many1(blank_line), |lines: &Vec<OrgSource<'_>>| {
+            lines.len() >= 2
+        }),
     )))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn plain_list_item_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn plain_list_item_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     recognize(tuple((
         opt(blank_line),
@@ -194,14 +208,17 @@ fn plain_list_item_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn line_indented_lte<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn line_indented_lte<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let current_item_indent_level: &usize =
         get_context_item_indent(context).ok_or(nom::Err::Error(CustomError::MyError(MyError(
-            "Not inside a plain list item",
+            "Not inside a plain list item".into(),
         ))))?;
 
     let matched = recognize(verify(
-        tuple((space0::<&str, _>, non_whitespace_character)),
+        tuple((space0::<OrgSource<'_>, _>, non_whitespace_character)),
         // It is fine that we get the indent level using the number of bytes rather than the number of characters because nom's space0 only matches space and tab (0x20 and 0x09)
         |(_space0, _anychar)| _space0.len() <= *current_item_indent_level,
     ))(input)?;
diff --git a/src/parser/plain_text.rs b/src/parser/plain_text.rs
index 76755fe..bdc9deb 100644
--- a/src/parser/plain_text.rs
+++ b/src/parser/plain_text.rs
@@ -8,6 +8,7 @@ use nom::combinator::verify;
 use nom::multi::many_till;
 
 use super::object::PlainText;
+use super::org_source::OrgSource;
 use super::radio_link::RematchObject;
 use super::Context;
 use super::Object;
@@ -17,7 +18,10 @@ use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::exit_matcher_parser;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn plain_text<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, PlainText<'s>> {
+pub fn plain_text<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, PlainText<'s>> {
     let (remaining, source) = recognize(verify(
         many_till(
             anychar,
@@ -29,11 +33,19 @@ pub fn plain_text<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
         |(children, _exit_contents)| !children.is_empty(),
     ))(input)?;
 
-    Ok((remaining, PlainText { source }))
+    Ok((
+        remaining,
+        PlainText {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn plain_text_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn plain_text_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(parser_with_context!(any_object_except_plain_text)(context))(input)
 }
 
@@ -42,10 +54,12 @@ impl<'x> RematchObject<'x> for PlainText<'x> {
     fn rematch_object<'r, 's>(
         &'x self,
         _context: Context<'r, 's>,
-        input: &'s str,
-    ) -> Res<&'s str, Object<'s>> {
+        input: OrgSource<'s>,
+    ) -> Res<OrgSource<'s>, Object<'s>> {
         map(tag(self.source), |s| {
-            Object::PlainText(PlainText { source: s })
+            Object::PlainText(PlainText {
+                source: Into::<&str>::into(s),
+            })
         })(input)
     }
 }
diff --git a/src/parser/planning.rs b/src/parser/planning.rs
index faea297..bbaed9c 100644
--- a/src/parser/planning.rs
+++ b/src/parser/planning.rs
@@ -9,6 +9,7 @@ use nom::combinator::eof;
 use nom::multi::separated_list1;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::lesser_element::Planning;
@@ -16,7 +17,10 @@ use crate::parser::util::get_consumed;
 use crate::parser::util::start_of_line;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn planning<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Planning<'s>> {
+pub fn planning<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Planning<'s>> {
     start_of_line(context, input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, _planning_parameters) = separated_list1(space1, planning_parameter)(remaining)?;
@@ -24,11 +28,16 @@ pub fn planning<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str
 
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, Planning { source }))
+    Ok((
+        remaining,
+        Planning {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn planning_parameter<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+fn planning_parameter<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _planning_type) = alt((
         tag_no_case("DEADLINE"),
         tag_no_case("SCHEDULED"),
diff --git a/src/parser/property_drawer.rs b/src/parser/property_drawer.rs
index 7d63a31..3e78ecf 100644
--- a/src/parser/property_drawer.rs
+++ b/src/parser/property_drawer.rs
@@ -12,6 +12,7 @@ use nom::combinator::recognize;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
@@ -32,11 +33,11 @@ use crate::parser::util::start_of_line;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn property_drawer<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, PropertyDrawer<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, PropertyDrawer<'s>> {
     if immediate_in_section(context, "property-drawer") {
         return Err(nom::Err::Error(CustomError::MyError(MyError(
-            "Cannot nest objects of the same element",
+            "Cannot nest objects of the same element".into(),
         ))));
     }
     let (
@@ -68,11 +69,20 @@ pub fn property_drawer<'r, 's>(
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, PropertyDrawer { source, children }))
+    Ok((
+        remaining,
+        PropertyDrawer {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn property_drawer_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn property_drawer_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(tuple((
         parser_with_context!(start_of_line)(context),
         space0,
@@ -85,8 +95,8 @@ fn property_drawer_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn node_property<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, NodeProperty<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, NodeProperty<'s>> {
     let (remaining, (_start_of_line, _leading_whitespace, _open_colon, _name, _close_colon)) =
         tuple((
             parser_with_context!(start_of_line)(context),
@@ -95,13 +105,17 @@ fn node_property<'r, 's>(
             parser_with_context!(node_property_name)(context),
             tag(":"),
         ))(input)?;
-    match tuple((space0::<&str, nom::error::Error<&str>>, line_ending))(remaining) {
+    match tuple((
+        space0::<OrgSource<'_>, nom::error::Error<OrgSource<'_>>>,
+        line_ending,
+    ))(remaining)
+    {
         Ok((remaining, _ws)) => {
             let source = get_consumed(input, remaining);
             Ok((
                 remaining,
                 NodeProperty {
-                    source,
+                    source: source.into(),
                     value: None,
                 },
             ))
@@ -113,8 +127,8 @@ fn node_property<'r, 's>(
             Ok((
                 remaining,
                 NodeProperty {
-                    source,
-                    value: Some(value),
+                    source: source.into(),
+                    value: Some(value.into()),
                 },
             ))
         }
@@ -122,7 +136,10 @@ fn node_property<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn node_property_name<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn node_property_name<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -141,7 +158,7 @@ fn node_property_name<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn node_property_name_end<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     alt((tag("+:"), tag(":")))(input)
 }
diff --git a/src/parser/radio_link.rs b/src/parser/radio_link.rs
index c1d4d45..8f72205 100644
--- a/src/parser/radio_link.rs
+++ b/src/parser/radio_link.rs
@@ -5,6 +5,7 @@ use nom::character::complete::space0;
 use nom::combinator::verify;
 use nom::multi::many_till;
 
+use super::org_source::OrgSource;
 use super::Context;
 use super::Object;
 use crate::error::CustomError;
@@ -21,7 +22,10 @@ use crate::parser::RadioLink;
 use crate::parser::RadioTarget;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn radio_link<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, RadioLink<'s>> {
+pub fn radio_link<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, RadioLink<'s>> {
     let radio_targets = context
         .iter()
         .filter_map(|context_element| match context_element.get_data() {
@@ -37,14 +41,14 @@ pub fn radio_link<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
             return Ok((
                 remaining,
                 RadioLink {
-                    source,
+                    source: source.into(),
                     children: rematched_target,
                 },
             ));
         }
     }
     Err(nom::Err::Error(CustomError::MyError(MyError(
-        "NoRadioLink",
+        "NoRadioLink".into(),
     ))))
 }
 
@@ -52,8 +56,8 @@ pub fn radio_link<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
 pub fn rematch_target<'x, 'r, 's>(
     context: Context<'r, 's>,
     target: &'x Vec<Object<'x>>,
-    input: &'s str,
-) -> Res<&'s str, Vec<Object<'s>>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     let mut remaining = input;
     let mut new_matches = Vec::with_capacity(target.len());
     for original_object in target {
@@ -71,7 +75,7 @@ pub fn rematch_target<'x, 'r, 's>(
             }
             _ => {
                 return Err(nom::Err::Error(CustomError::MyError(MyError(
-                    "OnlyMinimalSetObjectsAllowed",
+                    "OnlyMinimalSetObjectsAllowed".into(),
                 ))));
             }
         };
@@ -82,8 +86,8 @@ pub fn rematch_target<'x, 'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn radio_target<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, RadioTarget<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, RadioTarget<'s>> {
     let (remaining, _opening) = tag("<<<")(input)?;
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
@@ -102,11 +106,20 @@ pub fn radio_target<'r, 's>(
     let (remaining, _closing) = tag(">>>")(remaining)?;
     let (remaining, _trailing_whitespace) = space0(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, RadioTarget { source, children }))
+    Ok((
+        remaining,
+        RadioTarget {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn radio_target_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn radio_target_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     alt((tag("<"), tag(">"), line_ending))(input)
 }
 
@@ -114,8 +127,8 @@ pub trait RematchObject<'x> {
     fn rematch_object<'r, 's>(
         &'x self,
         context: Context<'r, 's>,
-        input: &'s str,
-    ) -> Res<&'s str, Object<'s>>;
+        input: OrgSource<'s>,
+    ) -> Res<OrgSource<'s>, Object<'s>>;
 }
 
 #[cfg(test)]
diff --git a/src/parser/regular_link.rs b/src/parser/regular_link.rs
index d5664ab..2441961 100644
--- a/src/parser/regular_link.rs
+++ b/src/parser/regular_link.rs
@@ -7,6 +7,7 @@ use nom::character::complete::space0;
 use nom::combinator::verify;
 use nom::multi::many_till;
 
+use super::org_source::OrgSource;
 use super::parser_with_context::parser_with_context;
 use super::util::get_consumed;
 use super::Context;
@@ -22,8 +23,8 @@ use crate::parser::util::exit_matcher_parser;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn regular_link<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, RegularLink<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, RegularLink<'s>> {
     alt((
         parser_with_context!(regular_link_without_description)(context),
         parser_with_context!(regular_link_with_description)(context),
@@ -33,21 +34,26 @@ pub fn regular_link<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn regular_link_without_description<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, RegularLink<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, RegularLink<'s>> {
     let (remaining, _opening_bracket) = tag("[[")(input)?;
     let (remaining, _path) = pathreg(context, remaining)?;
     let (remaining, _closing_bracket) = tag("]]")(remaining)?;
     let (remaining, _trailing_whitespace) = space0(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, RegularLink { source }))
+    Ok((
+        remaining,
+        RegularLink {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn regular_link_with_description<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, RegularLink<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, RegularLink<'s>> {
     let (remaining, _opening_bracket) = tag("[[")(input)?;
     let (remaining, _path) = pathreg(context, remaining)?;
     let (remaining, _closing_bracket) = tag("][")(remaining)?;
@@ -55,11 +61,19 @@ pub fn regular_link_with_description<'r, 's>(
     let (remaining, _closing_bracket) = tag("]]")(remaining)?;
     let (remaining, _trailing_whitespace) = space0(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, RegularLink { source }))
+    Ok((
+        remaining,
+        RegularLink {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn pathreg<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+pub fn pathreg<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, path) = escaped(
         take_till1(|c| match c {
             '\\' | ']' => true,
@@ -74,8 +88,8 @@ pub fn pathreg<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn description<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Vec<Object<'s>>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -93,6 +107,9 @@ pub fn description<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn description_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn description_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     tag("]]")(input)
 }
diff --git a/src/parser/sexp.rs b/src/parser/sexp.rs
index 1a7aa4c..410c2c7 100644
--- a/src/parser/sexp.rs
+++ b/src/parser/sexp.rs
@@ -16,6 +16,9 @@ use nom::sequence::delimited;
 use nom::sequence::preceded;
 use nom::sequence::tuple;
 
+use super::org_source::convert_error;
+use super::org_source::OrgSource;
+use super::util::get_consumed;
 use crate::error::Res;
 
 #[derive(Debug)]
@@ -28,9 +31,7 @@ pub enum Token<'s> {
 
 #[derive(Debug)]
 pub struct TextWithProperties<'s> {
-    #[allow(dead_code)]
     pub text: &'s str,
-    #[allow(dead_code)]
     pub properties: Vec<Token<'s>>,
 }
 
@@ -135,24 +136,25 @@ impl<'s> Token<'s> {
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn sexp_with_padding<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
     let (remaining, _) = multispace0(input)?;
-    let (remaining, tkn) = token(remaining)?;
+    let remaining = OrgSource::new(remaining);
+    let (remaining, tkn) = token(remaining).map(|(rem, out)| (Into::<&str>::into(rem), out)).map_err(convert_error)?;
     let (remaining, _) = multispace0(remaining)?;
     Ok((remaining, tkn))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn sexp<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
+pub fn sexp<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, Token<'s>> {
     let (remaining, tkn) = token(input)?;
     Ok((remaining, tkn))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn token<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
+fn token<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, Token<'s>> {
     alt((list, vector, atom))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn list<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
+fn list<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, Token<'s>> {
     let (remaining, _) = tag("(")(input)?;
     let (remaining, children) = delimited(
         multispace0,
@@ -164,7 +166,7 @@ fn list<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn vector<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
+fn vector<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, Token<'s>> {
     let (remaining, _) = tag("[")(input)?;
     let (remaining, children) = delimited(
         multispace0,
@@ -176,7 +178,7 @@ fn vector<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn atom<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
+fn atom<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, Token<'s>> {
     not(peek(one_of(")]")))(input)?;
     alt((
         text_with_properties,
@@ -187,16 +189,16 @@ fn atom<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn unquoted_atom<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
+fn unquoted_atom<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, Token<'s>> {
     let (remaining, body) = take_till1(|c| match c {
         ' ' | '\t' | '\r' | '\n' | ')' | ']' => true,
         _ => false,
     })(input)?;
-    Ok((remaining, Token::Atom(body)))
+    Ok((remaining, Token::Atom(body.into())))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn quoted_atom<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
+fn quoted_atom<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, Token<'s>> {
     let (remaining, _) = tag(r#"""#)(input)?;
     let (remaining, _) = escaped(
         take_till1(|c| match c {
@@ -208,11 +210,11 @@ fn quoted_atom<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
     )(remaining)?;
     let (remaining, _) = tag(r#"""#)(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, Token::Atom(source)))
+    Ok((remaining, Token::Atom(source.into())))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn hash_notation<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
+fn hash_notation<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, Token<'s>> {
     let (remaining, _) = tag("#<")(input)?;
     let (remaining, _body) = take_till1(|c| match c {
         '>' => true,
@@ -220,10 +222,10 @@ fn hash_notation<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
     })(remaining)?;
     let (remaining, _) = tag(">")(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, Token::Atom(source)))
+    Ok((remaining, Token::Atom(source.into())))
 }
 
-fn text_with_properties<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
+fn text_with_properties<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, Token<'s>> {
     let (remaining, _) = tag("#(")(input)?;
     let (remaining, (text, props)) = delimited(
         multispace0,
@@ -246,25 +248,6 @@ fn text_with_properties<'s>(input: &'s str) -> Res<&'s str, Token<'s>> {
     ))
 }
 
-/// Get a slice of the string that was consumed in a parser using the original input to the parser and the remaining input after the parser.
-fn get_consumed<'s>(input: &'s str, remaining: &'s str) -> &'s str {
-    assert!(is_slice_of(input, remaining));
-    let source = {
-        let offset = remaining.as_ptr() as usize - input.as_ptr() as usize;
-        &input[..offset]
-    };
-    source
-}
-
-/// Check if the child string slice is a slice of the parent string slice.
-fn is_slice_of(parent: &str, child: &str) -> bool {
-    let parent_start = parent.as_ptr() as usize;
-    let parent_end = parent_start + parent.len();
-    let child_start = child.as_ptr() as usize;
-    let child_end = child_start + child.len();
-    child_start >= parent_start && child_end <= parent_end
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/parser/statistics_cookie.rs b/src/parser/statistics_cookie.rs
index 30fdac7..92bc578 100644
--- a/src/parser/statistics_cookie.rs
+++ b/src/parser/statistics_cookie.rs
@@ -4,6 +4,7 @@ use nom::character::complete::space0;
 use nom::combinator::recognize;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::parser_with_context::parser_with_context;
@@ -12,8 +13,8 @@ use crate::parser::StatisticsCookie;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn statistics_cookie<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, StatisticsCookie<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, StatisticsCookie<'s>> {
     alt((
         parser_with_context!(percent_statistics_cookie)(context),
         parser_with_context!(fraction_statistics_cookie)(context),
@@ -23,19 +24,24 @@ pub fn statistics_cookie<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn percent_statistics_cookie<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, StatisticsCookie<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, StatisticsCookie<'s>> {
     let (remaining, source) =
         recognize(tuple((tag("["), nom::character::complete::u64, tag("%]"))))(input)?;
     let (remaining, _) = space0(remaining)?;
-    Ok((remaining, StatisticsCookie { source }))
+    Ok((
+        remaining,
+        StatisticsCookie {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn fraction_statistics_cookie<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, StatisticsCookie<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, StatisticsCookie<'s>> {
     let (remaining, source) = recognize(tuple((
         tag("["),
         nom::character::complete::u64,
@@ -44,5 +50,10 @@ pub fn fraction_statistics_cookie<'r, 's>(
         tag("]"),
     )))(input)?;
     let (remaining, _) = space0(remaining)?;
-    Ok((remaining, StatisticsCookie { source }))
+    Ok((
+        remaining,
+        StatisticsCookie {
+            source: source.into(),
+        },
+    ))
 }
diff --git a/src/parser/subscript_and_superscript.rs b/src/parser/subscript_and_superscript.rs
index 05e0455..529dc76 100644
--- a/src/parser/subscript_and_superscript.rs
+++ b/src/parser/subscript_and_superscript.rs
@@ -11,6 +11,7 @@ use nom::combinator::recognize;
 use nom::combinator::verify;
 use nom::multi::many_till;
 
+use super::org_source::OrgSource;
 use super::Context;
 use super::Object;
 use crate::error::CustomError;
@@ -29,32 +30,45 @@ use crate::parser::Subscript;
 use crate::parser::Superscript;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn subscript<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Subscript<'s>> {
+pub fn subscript<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Subscript<'s>> {
     // We check for the underscore first before checking the pre-character as a minor optimization to avoid walking up the context tree to find the document root unnecessarily.
     let (remaining, _) = tag("_")(input)?;
     pre(context, input)?;
     let (remaining, _body) = script_body(context, remaining)?;
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, Subscript { source }))
+    Ok((
+        remaining,
+        Subscript {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn superscript<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Superscript<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Superscript<'s>> {
     // We check for the circumflex first before checking the pre-character as a minor optimization to avoid walking up the context tree to find the document root unnecessarily.
     let (remaining, _) = tag("^")(input)?;
     pre(context, input)?;
     let (remaining, _body) = script_body(context, remaining)?;
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, Superscript { source }))
+    Ok((
+        remaining,
+        Superscript {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
+fn pre<'r, 's>(context: Context<'r, 's>, input: OrgSource<'s>) -> Res<OrgSource<'s>, ()> {
     let document_root = context.get_document_root().unwrap();
     let preceding_character = get_one_before(document_root, input)
         .map(|slice| slice.chars().next())
@@ -63,7 +77,7 @@ fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
         Some(c) if !c.is_whitespace() => {}
         _ => {
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "Must be preceded by a non-whitespace character.",
+                "Must be preceded by a non-whitespace character.".into(),
             ))));
         }
     };
@@ -77,27 +91,36 @@ enum ScriptBody<'s> {
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn script_body<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ScriptBody<'s>> {
+fn script_body<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, ScriptBody<'s>> {
     alt((
         map(parser_with_context!(script_asterisk)(context), |body| {
-            ScriptBody::Braceless(body)
+            ScriptBody::Braceless(body.into())
         }),
         map(parser_with_context!(script_alphanum)(context), |body| {
-            ScriptBody::Braceless(body)
+            ScriptBody::Braceless(body.into())
         }),
         map(parser_with_context!(script_with_braces)(context), |body| {
-            ScriptBody::WithBraces(body)
+            ScriptBody::WithBraces(body.into())
         }),
     ))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn script_asterisk<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn script_asterisk<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     tag("*")(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn script_alphanum<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn script_alphanum<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _sign) = opt(recognize(one_of("+-")))(input)?;
     let (remaining, _script) = many_till(
         parser_with_context!(script_alphanum_character)(context),
@@ -110,8 +133,8 @@ fn script_alphanum<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn script_alphanum_character<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(verify(anychar, |c| {
         c.is_alphanumeric() || r#",.\"#.contains(*c)
     }))(input)
@@ -120,8 +143,8 @@ fn script_alphanum_character<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn end_script_alphanum_character<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, final_char) = recognize(verify(anychar, |c| c.is_alphanumeric()))(input)?;
     peek(not(parser_with_context!(script_alphanum_character)(
         context,
@@ -132,13 +155,13 @@ fn end_script_alphanum_character<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn script_with_braces<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Vec<Object<'s>>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     let (remaining, _) = tag("{")(input)?;
     let parser_context = context
         .with_additional_node(ContextElement::SubscriptSuperscriptBrace(
             SubscriptSuperscriptBrace {
-                position: remaining,
+                position: remaining.into(),
                 depth: 0,
             },
         ))
@@ -159,13 +182,13 @@ fn script_with_braces<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn script_with_braces_end<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let context_depth = get_bracket_depth(context)
         .expect("This function should only be called from inside a subscript or superscript.");
     let text_since_context_entry = get_consumed(context_depth.position, input);
     let mut current_depth = context_depth.depth;
-    for c in text_since_context_entry.chars() {
+    for c in Into::<&str>::into(text_since_context_entry).chars() {
         match c {
             '{' => {
                 current_depth += 1;
@@ -180,13 +203,13 @@ fn script_with_braces_end<'r, 's>(
         }
     }
     if current_depth == 0 {
-        let close_bracket = tag::<&str, &str, CustomError<&str>>("}")(input);
+        let close_bracket = tag::<&str, OrgSource<'_>, CustomError<OrgSource<'_>>>("}")(input);
         if close_bracket.is_ok() {
             return close_bracket;
         }
     }
     return Err(nom::Err::Error(CustomError::MyError(MyError(
-        "Not a valid end for subscript or superscript.",
+        "Not a valid end for subscript or superscript.".into(),
     ))));
 }
 
diff --git a/src/parser/table.rs b/src/parser/table.rs
index 286f555..01029d4 100644
--- a/src/parser/table.rs
+++ b/src/parser/table.rs
@@ -12,6 +12,7 @@ use nom::multi::many1;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::exiting::ExitClass;
@@ -31,7 +32,10 @@ use crate::parser::Table;
 ///
 /// This is not the table.el style.
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn org_mode_table<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Table<'s>> {
+pub fn org_mode_table<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Table<'s>> {
     start_of_line(context, input)?;
     peek(tuple((space0, tag("|"))))(input)?;
 
@@ -52,11 +56,20 @@ pub fn org_mode_table<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&
     // TODO: Consume trailing formulas
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, Table { source, children }))
+    Ok((
+        remaining,
+        Table {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn table_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn table_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     recognize(tuple((space0, not(tag("|")))))(input)
 }
@@ -64,8 +77,8 @@ fn table_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn org_mode_table_row<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, TableRow<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, TableRow<'s>> {
     alt((
         parser_with_context!(org_mode_table_row_rule)(context),
         parser_with_context!(org_mode_table_row_regular)(context),
@@ -75,15 +88,15 @@ pub fn org_mode_table_row<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn org_mode_table_row_rule<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, TableRow<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, TableRow<'s>> {
     start_of_line(context, input)?;
     let (remaining, _) = tuple((space0, tag("|-"), is_not("\r\n"), line_ending))(input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
         TableRow {
-            source,
+            source: source.into(),
             children: Vec::new(),
         },
     ))
@@ -92,22 +105,28 @@ pub fn org_mode_table_row_rule<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn org_mode_table_row_regular<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, TableRow<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, TableRow<'s>> {
     start_of_line(context, input)?;
     let (remaining, _) = tuple((space0, tag("|")))(input)?;
     let (remaining, children) =
         many1(parser_with_context!(org_mode_table_cell)(context))(remaining)?;
     let (remaining, _tail) = recognize(tuple((space0, alt((line_ending, eof)))))(remaining)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, TableRow { source, children }))
+    Ok((
+        remaining,
+        TableRow {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn org_mode_table_cell<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, TableCell<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, TableCell<'s>> {
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -118,29 +137,37 @@ pub fn org_mode_table_cell<'r, 's>(
     let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
     let (remaining, (children, _exit_contents)) = verify(
         many_till(table_cell_set_object_matcher, exit_matcher),
-        |(children, exit_contents)| !children.is_empty() || exit_contents.ends_with("|"),
+        |(children, exit_contents)| {
+            !children.is_empty() || Into::<&str>::into(exit_contents).ends_with("|")
+        },
     )(input)?;
 
     let (remaining, _tail) = org_mode_table_cell_end(&parser_context, remaining)?;
 
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, TableCell { source, children }))
+    Ok((
+        remaining,
+        TableCell {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn org_mode_table_cell_end<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(tuple((space0, alt((tag("|"), peek(line_ending))))))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn table_cell_set_object<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Object<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Object<'s>> {
     not(|i| context.check_exit_matcher(i))(input)?;
 
     parser_with_context!(minimal_set_object)(context)(input)
diff --git a/src/parser/target.rs b/src/parser/target.rs
index 6acd36e..02c5aa1 100644
--- a/src/parser/target.rs
+++ b/src/parser/target.rs
@@ -7,6 +7,7 @@ use nom::combinator::recognize;
 use nom::combinator::verify;
 use nom::multi::many_till;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
@@ -21,7 +22,10 @@ use crate::parser::util::get_one_before;
 use crate::parser::Target;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn target<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Target<'s>> {
+pub fn target<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Target<'s>> {
     let (remaining, _) = tag("<<")(input)?;
     let (remaining, _) = peek(verify(anychar, |c| {
         !c.is_whitespace() && !"<>\n".contains(*c)
@@ -44,17 +48,25 @@ pub fn target<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
         .expect("We cannot be at the start of the file because we are inside a target.");
     if preceding_character.is_whitespace() {
         return Err(nom::Err::Error(CustomError::MyError(MyError(
-            "Targets cannot end with whitespace.",
+            "Targets cannot end with whitespace.".into(),
         ))));
     }
     let (remaining, _) = tag(">>")(remaining)?;
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, Target { source }))
+    Ok((
+        remaining,
+        Target {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn target_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn target_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(one_of("<>\n"))(input)
 }
diff --git a/src/parser/text_markup.rs b/src/parser/text_markup.rs
index 59a5d09..fc340be 100644
--- a/src/parser/text_markup.rs
+++ b/src/parser/text_markup.rs
@@ -15,6 +15,7 @@ use nom::sequence::terminated;
 #[cfg(feature = "tracing")]
 use tracing::span;
 
+use super::org_source::OrgSource;
 use super::radio_link::RematchObject;
 use super::Context;
 use crate::error::CustomError;
@@ -39,7 +40,10 @@ use crate::parser::Underline;
 use crate::parser::Verbatim;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn text_markup<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Object<'s>> {
+pub fn text_markup<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Object<'s>> {
     alt((
         map(parser_with_context!(bold)(context), Object::Bold),
         map(parser_with_context!(italic)(context), Object::Italic),
@@ -54,73 +58,126 @@ pub fn text_markup<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn bold<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Bold<'s>> {
+pub fn bold<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Bold<'s>> {
     let text_markup_object_specialized = text_markup_object("*");
     let (remaining, children) = text_markup_object_specialized(context, input)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, Bold { source, children }))
+    Ok((
+        remaining,
+        Bold {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn italic<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Italic<'s>> {
+pub fn italic<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Italic<'s>> {
     let text_markup_object_specialized = text_markup_object("/");
     let (remaining, children) = text_markup_object_specialized(context, input)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, Italic { source, children }))
+    Ok((
+        remaining,
+        Italic {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn underline<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Underline<'s>> {
+pub fn underline<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Underline<'s>> {
     let text_markup_object_specialized = text_markup_object("_");
     let (remaining, children) = text_markup_object_specialized(context, input)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, Underline { source, children }))
+    Ok((
+        remaining,
+        Underline {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn strike_through<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, StrikeThrough<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, StrikeThrough<'s>> {
     let text_markup_object_specialized = text_markup_object("+");
     let (remaining, children) = text_markup_object_specialized(context, input)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, StrikeThrough { source, children }))
+    Ok((
+        remaining,
+        StrikeThrough {
+            source: source.into(),
+            children,
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn verbatim<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Verbatim<'s>> {
+pub fn verbatim<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Verbatim<'s>> {
     let text_markup_string_specialized = text_markup_string("=");
     let (remaining, contents) = text_markup_string_specialized(context, input)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, Verbatim { source, contents }))
+    Ok((
+        remaining,
+        Verbatim {
+            source: source.into(),
+            contents: contents.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn code<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Code<'s>> {
+pub fn code<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Code<'s>> {
     let text_markup_string_specialized = text_markup_string("~");
     let (remaining, contents) = text_markup_string_specialized(context, input)?;
     let source = get_consumed(input, remaining);
-    Ok((remaining, Code { source, contents }))
+    Ok((
+        remaining,
+        Code {
+            source: source.into(),
+            contents: contents.into(),
+        },
+    ))
 }
 
 fn text_markup_object(
     marker_symbol: &str,
-) -> impl for<'r, 's> Fn(Context<'r, 's>, &'s str) -> Res<&'s str, Vec<Object<'s>>> {
+) -> impl for<'r, 's> Fn(Context<'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     let marker_symbol = marker_symbol.to_owned();
-    move |context: Context, input: &str| _text_markup_object(context, input, marker_symbol.as_str())
+    move |context: Context, input: OrgSource<'_>| {
+        _text_markup_object(context, input, marker_symbol.as_str())
+    }
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn _text_markup_object<'r, 's, 'x>(
     context: Context<'r, 's>,
-    input: &'s str,
+    input: OrgSource<'s>,
     marker_symbol: &'x str,
-) -> Res<&'s str, Vec<Object<'s>>> {
+) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     let (remaining, _) = pre(context, input)?;
     let (remaining, open) = tag(marker_symbol)(remaining)?;
     let (remaining, _peek_not_whitespace) = peek(not(multispace1))(remaining)?;
-    let text_markup_end_specialized = text_markup_end(open);
+    let text_markup_end_specialized = text_markup_end(open.into());
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -142,7 +199,7 @@ fn _text_markup_object<'r, 's, 'x>(
         let _enter = span.enter();
         if exit_matcher_parser(context, remaining).is_ok() {
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "Parent exit matcher is triggering.",
+                "Parent exit matcher is triggering.".into(),
             ))));
         }
     }
@@ -154,21 +211,23 @@ fn _text_markup_object<'r, 's, 'x>(
 
 fn text_markup_string(
     marker_symbol: &str,
-) -> impl for<'r, 's> Fn(Context<'r, 's>, &'s str) -> Res<&'s str, &'s str> {
+) -> impl for<'r, 's> Fn(Context<'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let marker_symbol = marker_symbol.to_owned();
-    move |context: Context, input: &str| _text_markup_string(context, input, marker_symbol.as_str())
+    move |context: Context, input: OrgSource<'_>| {
+        _text_markup_string(context, input, marker_symbol.as_str())
+    }
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn _text_markup_string<'r, 's, 'x>(
     context: Context<'r, 's>,
-    input: &'s str,
+    input: OrgSource<'s>,
     marker_symbol: &'x str,
-) -> Res<&'s str, &'s str> {
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, _) = pre(context, input)?;
     let (remaining, open) = tag(marker_symbol)(remaining)?;
     let (remaining, _peek_not_whitespace) = peek(not(multispace1))(remaining)?;
-    let text_markup_end_specialized = text_markup_end(open);
+    let text_markup_end_specialized = text_markup_end(open.into());
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -190,7 +249,7 @@ fn _text_markup_string<'r, 's, 'x>(
         let _enter = span.enter();
         if exit_matcher_parser(context, remaining).is_ok() {
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "Parent exit matcher is triggering.",
+                "Parent exit matcher is triggering.".into(),
             ))));
         }
     }
@@ -201,7 +260,7 @@ fn _text_markup_string<'r, 's, 'x>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
+pub fn pre<'r, 's>(context: Context<'r, 's>, input: OrgSource<'s>) -> Res<OrgSource<'s>, ()> {
     let document_root = context.get_document_root().unwrap();
     let preceding_character = get_one_before(document_root, input)
         .map(|slice| slice.chars().next())
@@ -213,7 +272,7 @@ pub fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()>
         Some(_) => {
             // Not at start of line, cannot be a heading
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "Not a valid pre character for text markup.",
+                "Not a valid pre character for text markup.".into(),
             ))));
         }
     };
@@ -221,24 +280,26 @@ pub fn pre<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()>
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn post<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
+pub fn post<'r, 's>(context: Context<'r, 's>, input: OrgSource<'s>) -> Res<OrgSource<'s>, ()> {
     let (remaining, _) = alt((recognize(one_of(" \r\n\t-.,;:!?')}[\">")), line_ending))(input)?;
     Ok((remaining, ()))
 }
 
 fn text_markup_end(
     marker_symbol: &str,
-) -> impl for<'r, 's> Fn(Context<'r, 's>, &'s str) -> Res<&'s str, &'s str> {
+) -> impl for<'r, 's> Fn(Context<'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let marker_symbol = marker_symbol.to_owned();
-    move |context: Context, input: &str| _text_markup_end(context, input, marker_symbol.as_str())
+    move |context: Context, input: OrgSource<'_>| {
+        _text_markup_end(context, input, marker_symbol.as_str())
+    }
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn _text_markup_end<'r, 's, 'x>(
     context: Context<'r, 's>,
-    input: &'s str,
+    input: OrgSource<'s>,
     marker_symbol: &'x str,
-) -> Res<&'s str, &'s str> {
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     not(parser_with_context!(preceded_by_whitespace)(context))(input)?;
     let (remaining, _marker) = terminated(
         tag(marker_symbol),
@@ -253,26 +314,32 @@ impl<'x> RematchObject<'x> for Bold<'x> {
     fn rematch_object<'r, 's>(
         &'x self,
         _context: Context<'r, 's>,
-        input: &'s str,
-    ) -> Res<&'s str, Object<'s>> {
+        input: OrgSource<'s>,
+    ) -> Res<OrgSource<'s>, Object<'s>> {
         let (remaining, children) =
             _rematch_text_markup_object(_context, input, "*", &self.children)?;
         let source = get_consumed(input, remaining);
-        Ok((remaining, Object::Bold(Bold { source, children })))
+        Ok((
+            remaining,
+            Object::Bold(Bold {
+                source: source.into(),
+                children,
+            }),
+        ))
     }
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn _rematch_text_markup_object<'r, 's, 'x>(
     context: Context<'r, 's>,
-    input: &'s str,
+    input: OrgSource<'s>,
     marker_symbol: &'static str,
     original_match_children: &'x Vec<Object<'x>>,
-) -> Res<&'s str, Vec<Object<'s>>> {
+) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     let (remaining, _) = pre(context, input)?;
     let (remaining, open) = tag(marker_symbol)(remaining)?;
     let (remaining, _peek_not_whitespace) = peek(not(multispace1))(remaining)?;
-    let text_markup_end_specialized = text_markup_end(open);
+    let text_markup_end_specialized = text_markup_end(open.into());
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -290,7 +357,7 @@ fn _rematch_text_markup_object<'r, 's, 'x>(
         let _enter = span.enter();
         if exit_matcher_parser(context, remaining).is_ok() {
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "Parent exit matcher is triggering.",
+                "Parent exit matcher is triggering.".into(),
             ))));
         }
     }
diff --git a/src/parser/timestamp.rs b/src/parser/timestamp.rs
index 2680836..7e48346 100644
--- a/src/parser/timestamp.rs
+++ b/src/parser/timestamp.rs
@@ -11,6 +11,7 @@ use nom::combinator::verify;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::exiting::ExitClass;
@@ -23,7 +24,10 @@ use crate::parser::util::get_consumed;
 use crate::parser::Timestamp;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn timestamp<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Timestamp<'s>> {
+pub fn timestamp<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Timestamp<'s>> {
     // TODO: This would be more efficient if we didn't throw away the parse result of the first half of an active/inactive date range timestamp if the parse fails (as in, the first thing active_date_range_timestamp parses is a active_timestamp but then we throw that away if it doesn't turn out to be a full active_date_range_timestamp despite the active_timestamp parse being completely valid). I am going with the simplest/cleanest approach for the first implementation.
     alt((
         // Order matters here. If its a date range, we need to parse the entire date range instead of just the first timestamp. If its a time range, we need to make sure thats parsed as a time range instead of as the "rest" portion of a single timestamp.
@@ -40,19 +44,27 @@ pub fn timestamp<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s st
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn diary_timestamp<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Timestamp<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Timestamp<'s>> {
     let (remaining, _) = tag("<%%(")(input)?;
     let (remaining, _body) = sexp(context, remaining)?;
     let (remaining, _) = tag(")>")(remaining)?;
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, Timestamp { source }))
+    Ok((
+        remaining,
+        Timestamp {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn sexp<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn sexp<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -71,15 +83,18 @@ fn sexp<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s st
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn sexp_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn sexp_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     alt((tag(")>"), recognize(one_of(">\n"))))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn active_timestamp<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Timestamp<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Timestamp<'s>> {
     let (remaining, _) = tag("<")(input)?;
     let (remaining, _date) = date(context, remaining)?;
     let time_context =
@@ -100,14 +115,19 @@ fn active_timestamp<'r, 's>(
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, Timestamp { source }))
+    Ok((
+        remaining,
+        Timestamp {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn inactive_timestamp<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Timestamp<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Timestamp<'s>> {
     let (remaining, _) = tag("[")(input)?;
     let (remaining, _date) = date(context, remaining)?;
     let time_context =
@@ -128,14 +148,19 @@ fn inactive_timestamp<'r, 's>(
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, Timestamp { source }))
+    Ok((
+        remaining,
+        Timestamp {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn active_date_range_timestamp<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Timestamp<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Timestamp<'s>> {
     let (remaining, _first_timestamp) = active_timestamp(context, input)?;
     // TODO: Does the space0 at the end of the active/inactive timestamp parsers cause this to be incorrect? I could use a look-behind to make sure the preceding character is not whitespace
     let (remaining, _separator) = tag("--")(remaining)?;
@@ -144,14 +169,19 @@ fn active_date_range_timestamp<'r, 's>(
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, Timestamp { source }))
+    Ok((
+        remaining,
+        Timestamp {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn active_time_range_timestamp<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Timestamp<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Timestamp<'s>> {
     let (remaining, _) = tag("<")(input)?;
     let (remaining, _date) = date(context, remaining)?;
     let time_context =
@@ -179,14 +209,19 @@ fn active_time_range_timestamp<'r, 's>(
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, Timestamp { source }))
+    Ok((
+        remaining,
+        Timestamp {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn inactive_date_range_timestamp<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Timestamp<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Timestamp<'s>> {
     let (remaining, _first_timestamp) = inactive_timestamp(context, input)?;
     // TODO: Does the space0 at the end of the active/inactive timestamp parsers cause this to be incorrect? I could use a look-behind to make sure the preceding character is not whitespace
     let (remaining, _separator) = tag("--")(remaining)?;
@@ -195,14 +230,19 @@ fn inactive_date_range_timestamp<'r, 's>(
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, Timestamp { source }))
+    Ok((
+        remaining,
+        Timestamp {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn inactive_time_range_timestamp<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Timestamp<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Timestamp<'s>> {
     let (remaining, _) = tag("[")(input)?;
     let (remaining, _date) = date(context, remaining)?;
     let time_context =
@@ -230,17 +270,26 @@ fn inactive_time_range_timestamp<'r, 's>(
     let (remaining, _) = space0(remaining)?;
     let source = get_consumed(input, remaining);
 
-    Ok((remaining, Timestamp { source }))
+    Ok((
+        remaining,
+        Timestamp {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn date<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
-    let (remaining, _year) = verify(digit1, |year: &str| year.len() == 4)(input)?;
+fn date<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
+    let (remaining, _year) = verify(digit1, |year: &OrgSource<'_>| year.len() == 4)(input)?;
     let (remaining, _) = tag("-")(remaining)?;
-    let (remaining, _month) = verify(digit1, |month: &str| month.len() == 2)(remaining)?;
+    let (remaining, _month) = verify(digit1, |month: &OrgSource<'_>| month.len() == 2)(remaining)?;
     let (remaining, _) = tag("-")(remaining)?;
-    let (remaining, _day_of_month) =
-        verify(digit1, |day_of_month: &str| day_of_month.len() == 2)(remaining)?;
+    let (remaining, _day_of_month) = verify(digit1, |day_of_month: &OrgSource<'_>| {
+        day_of_month.len() == 2
+    })(remaining)?;
     let (remaining, _dayname) =
         opt(tuple((space1, parser_with_context!(dayname)(context))))(remaining)?;
     let source = get_consumed(input, remaining);
@@ -248,7 +297,10 @@ fn date<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s st
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn dayname<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn dayname<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let parser_context =
         context.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Beta,
@@ -267,25 +319,36 @@ fn dayname<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn dayname_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn dayname_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(verify(anychar, |c| {
         c.is_whitespace() || "+-]>0123456789\n".contains(*c)
     }))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn time<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
-    let (remaining, _hour) =
-        verify(digit1, |hour: &str| hour.len() >= 1 && hour.len() <= 2)(input)?;
+fn time<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
+    let (remaining, _hour) = verify(digit1, |hour: &OrgSource<'_>| {
+        hour.len() >= 1 && hour.len() <= 2
+    })(input)?;
     let (remaining, _) = tag(":")(remaining)?;
-    let (remaining, _minute) = verify(digit1, |minute: &str| minute.len() == 2)(remaining)?;
+    let (remaining, _minute) =
+        verify(digit1, |minute: &OrgSource<'_>| minute.len() == 2)(remaining)?;
     let (remaining, _time_rest) = opt(parser_with_context!(time_rest)(context))(remaining)?;
     let source = get_consumed(input, remaining);
     Ok((remaining, source))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn time_rest<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn time_rest<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, body) = recognize(verify(
         many_till(anychar, parser_with_context!(exit_matcher_parser)(context)),
         |(body, _end_contents)| !body.is_empty(),
@@ -295,7 +358,10 @@ fn time_rest<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn active_time_rest_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn active_time_rest_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     alt((
         recognize(verify(anychar, |c| ">\n".contains(*c))),
         recognize(tuple((space1, parser_with_context!(repeater)(context)))),
@@ -309,8 +375,8 @@ fn active_time_rest_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn inactive_time_rest_end<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     alt((
         recognize(verify(anychar, |c| "]\n".contains(*c))),
         recognize(tuple((space1, parser_with_context!(repeater)(context)))),
@@ -322,7 +388,10 @@ fn inactive_time_rest_end<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn time_range_rest_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn time_range_rest_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     // We pop off the most recent context element to get a context tree with just the active/inactive_time_rest_end exit matcher (removing this function from the exit matcher chain) because the 2nd time in the range does not end when a "-TIME" pattern is found.
     let parent_node = context.iter().next().expect("Two context elements are added to the tree when adding this exit matcher, so it should be impossible for this to return None.");
     let parent_tree = ContextTree::branch_from(parent_node);
@@ -332,7 +401,10 @@ fn time_range_rest_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn repeater<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn repeater<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     // + for cumulative type
     // ++ for catch-up type
     // .+ for restart type
@@ -345,7 +417,10 @@ fn repeater<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn warning_delay<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn warning_delay<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     // - for all type
     // -- for first type
     let (remaining, _mark) = alt((tag("--"), tag("-")))(input)?;
diff --git a/src/parser/util.rs b/src/parser/util.rs
index b858a77..64ba6bf 100644
--- a/src/parser/util.rs
+++ b/src/parser/util.rs
@@ -50,7 +50,9 @@ pub fn immediate_in_section<'r, 's, 'x>(context: Context<'r, 's>, section_name:
 }
 
 /// Get one character from before the current position.
-pub fn get_one_before<'s>(document: &'s str, current_position: &'s str) -> Option<&'s str> {
+pub fn get_one_before<'s>(document: &'s str, current_position: OrgSource<'s>) -> Option<&'s str> {
+    // TODO: This should be replaced with new logic now that we are wrapping the input type.
+    let current_position = Into::<&str>::into(&current_position);
     assert!(is_slice_of(document, current_position));
     if document.as_ptr() as usize == current_position.as_ptr() as usize {
         return None;
@@ -63,8 +65,10 @@ pub fn get_one_before<'s>(document: &'s str, current_position: &'s str) -> Optio
 /// Get the line current_position is on up until current_position
 pub fn get_current_line_before_position<'s>(
     document: &'s str,
-    current_position: &'s str,
-) -> Option<&'s str> {
+    current_position: OrgSource<'s>,
+) -> Option<OrgSource<'s>> {
+    // TODO: This should be replaced with new logic now that we are wrapping the input type.
+    let current_position = Into::<&str>::into(&current_position);
     assert!(is_slice_of(document, current_position));
     if document.as_ptr() as usize == current_position.as_ptr() as usize {
         return None;
@@ -83,7 +87,7 @@ pub fn get_current_line_before_position<'s>(
         }
         previous_character_offset = new_offset;
     }
-    Some(&document[previous_character_offset..offset])
+    Some((&document[previous_character_offset..offset]).into())
 }
 
 /// Check if the child string slice is a slice of the parent string slice.
@@ -96,29 +100,23 @@ fn is_slice_of(parent: &str, child: &str) -> bool {
 }
 
 /// Get a slice of the string that was consumed in a parser using the original input to the parser and the remaining input after the parser.
-pub fn get_consumed<'s>(input: &'s str, remaining: &'s str) -> &'s str {
+pub fn get_consumed<'s>(input: OrgSource<'s>, remaining: OrgSource<'s>) -> OrgSource<'s> {
+    // TODO: This should be replaced with new logic now that we are wrapping the input type.
+    let input = Into::<&str>::into(&input);
+    let remaining = Into::<&str>::into(&remaining);
     assert!(is_slice_of(input, remaining));
     let source = {
         let offset = remaining.as_ptr() as usize - input.as_ptr() as usize;
         &input[..offset]
     };
-    source
+    source.into()
 }
 
 /// A line containing only whitespace and then a line break
 ///
 /// It is up to the caller to ensure this is called at the start of a line.
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn blank_line(input: &str) -> Res<&str, &str> {
-    not(eof)(input)?;
-    recognize(tuple((space0, alt((line_ending, eof)))))(input)
-}
-
-/// A line containing only whitespace and then a line break
-///
-/// It is up to the caller to ensure this is called at the start of a line.
-#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn new_blank_line<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
+pub fn blank_line(input: OrgSource<'_>) -> Res<OrgSource<'_>, OrgSource<'_>> {
     not(eof)(input)?;
     recognize(tuple((space0, alt((line_ending, eof)))))(input)
 }
@@ -126,8 +124,8 @@ pub fn new_blank_line<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn element_trailing_whitespace<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     alt((eof, recognize(many0(blank_line))))(input)
 }
@@ -135,8 +133,8 @@ pub fn element_trailing_whitespace<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn maybe_consume_trailing_whitespace_if_not_exiting<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Option<&'s str>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Option<OrgSource<'s>>> {
     if context.should_consume_trailing_whitespace() && exit_matcher_parser(context, input).is_err()
     {
         Ok(opt(parser_with_context!(element_trailing_whitespace)(
@@ -150,8 +148,8 @@ pub fn maybe_consume_trailing_whitespace_if_not_exiting<'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn maybe_consume_trailing_whitespace<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, Option<&'s str>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Option<OrgSource<'s>>> {
     if context.should_consume_trailing_whitespace() {
         Ok(opt(parser_with_context!(element_trailing_whitespace)(
             context,
@@ -162,13 +160,16 @@ pub fn maybe_consume_trailing_whitespace<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn trailing_whitespace(input: &str) -> Res<&str, &str> {
+pub fn trailing_whitespace(input: OrgSource<'_>) -> Res<OrgSource<'_>, OrgSource<'_>> {
     alt((eof, recognize(tuple((line_ending, many0(blank_line))))))(input)
 }
 
 /// Check that we are at the start of a line
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn start_of_line<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, ()> {
+pub fn start_of_line<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, ()> {
     let document_root = context.get_document_root().unwrap();
     let preceding_character = get_one_before(document_root, input)
         .map(|slice| slice.chars().next())
@@ -178,7 +179,7 @@ pub fn start_of_line<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'
         Some(_) => {
             // Not at start of line, cannot be a heading
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "Not at start of line",
+                "Not at start of line".into(),
             ))));
         }
         // If None, we are at the start of the file which allows for headings
@@ -191,8 +192,8 @@ pub fn start_of_line<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn preceded_by_whitespace<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, ()> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, ()> {
     let document_root = context.get_document_root().unwrap();
     let preceding_character = get_one_before(document_root, input)
         .map(|slice| slice.chars().next())
@@ -202,7 +203,7 @@ pub fn preceded_by_whitespace<'r, 's>(
         // If None, we are at the start of the file which is not allowed
         None | Some(_) => {
             return Err(nom::Err::Error(CustomError::MyError(MyError(
-                "Not preceded by whitespace.",
+                "Not preceded by whitespace.".into(),
             ))));
         }
     };
@@ -213,7 +214,7 @@ pub fn preceded_by_whitespace<'r, 's>(
 ///
 /// This function only operates on spaces, tabs, carriage returns, and line feeds. It does not handle fancy unicode whitespace.
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn non_whitespace_character(input: &str) -> Res<&str, char> {
+pub fn non_whitespace_character(input: OrgSource<'_>) -> Res<OrgSource<'_>, char> {
     none_of(" \t\r\n")(input)
 }
 
@@ -221,25 +222,31 @@ pub fn non_whitespace_character(input: &str) -> Res<&str, char> {
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn exit_matcher_parser<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, &'s str> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     peek(|i| context.check_exit_matcher(i))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn always_fail<'r, 's>(_context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+pub fn always_fail<'r, 's>(
+    _context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     Err(nom::Err::Error(CustomError::MyError(MyError(
-        "Always fail",
+        "Always fail".into(),
     ))))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn whitespace_eof(input: &str) -> Res<&str, &str> {
+pub fn whitespace_eof(input: OrgSource<'_>) -> Res<OrgSource<'_>, OrgSource<'_>> {
     recognize(tuple((multispace0, eof)))(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn text_until_exit<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+pub fn text_until_exit<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(verify(
         many_till(anychar, parser_with_context!(exit_matcher_parser)(context)),
         |(children, _exit_contents)| !children.is_empty(),
@@ -247,9 +254,9 @@ pub fn text_until_exit<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<
 }
 
 #[allow(dead_code)]
-pub fn not_yet_implemented() -> Res<&'static str, ()> {
+pub fn not_yet_implemented() -> Res<OrgSource<'static>, ()> {
     return Err(nom::Err::Error(CustomError::MyError(MyError(
-        "Not implemented yet.",
+        "Not implemented yet.".into(),
     ))));
 }