diff --git a/.gitignore b/.gitignore
index 3a55b65..3133a4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ prompt.sh
 prompt.txt
 compile_grammar.sh
 waddle.bnf
+waddle_flattened.bnf
diff --git a/grammar/core/base_types.bnf b/grammar/core/base_types.bnf
index 98eacf6..727b473 100644
--- a/grammar/core/base_types.bnf
+++ b/grammar/core/base_types.bnf
@@ -1,12 +1,8 @@
-<type> ::= <primitive_type> | <inherited_type> | <array_type> | <error_type>
+<type> ::= <primitive_type> | <inherited_type> | <array_type> | <inherited_error_type> | <callable_type_keyword>
+
+<base_type> ::= <primitive_type> | <inherited_type> | <inherited_error_type>
 
 <primitive_type> ::= <string_type_keyword> | <integer_type_keyword> | <decimal_type_keyword> | <boolean_type_keyword>
 
-<array_type> ::= <type> <array_symbol_open> <array_symbol_close>
+<array_type> ::= <base_type> <array_symbol_open> <array_symbol_close>
 
-<parameter_type> ::= <type> 
-                   | <callable_type_keyword>
-                   | <error_type>
-                   | "Any"
-
-<return_type_list> ::= "[" <optional_whitespace> <type> ( <optional_whitespace> "," <optional_whitespace> <type>)* <optional_whitespace> "]" | <callable_type_keyword>
diff --git a/grammar/core/comments.bnf b/grammar/core/comments.bnf
index 2902644..7e8dbea 100644
--- a/grammar/core/comments.bnf
+++ b/grammar/core/comments.bnf
@@ -1,6 +1,6 @@
 <comment> ::= <single_line_comment> | <multi_line_comment>
 
-<single_line_comment> ::= <single_line_comment_identifier> <single_line_comment_character>* <multi_line_whitespace>
+<single_line_comment> ::= <single_line_comment_identifier> <single_line_comment_character>*
 
 <multi_line_comment> ::= <multi_line_comment_open_identifier>
                          (<multi_line_comment_character> | <multi_line_comment>)*
@@ -8,4 +8,5 @@
 
 <single_line_comment_character> ::= <letter> | <digit> | <symbol> | <single_line_whitespace>
 
-<multi_line_comment_character> ::= <letter> | <digit> | <symbol> | <multi_line_whitespace>
+<multi_line_comment_character> ::= <letter> | <digit> | <symbol> | <optional_whitespace>
+
diff --git a/grammar/core/identifiers.bnf b/grammar/core/identifiers.bnf
index 8325013..1c09b07 100644
--- a/grammar/core/identifiers.bnf
+++ b/grammar/core/identifiers.bnf
@@ -1,4 +1,4 @@
-<identifier> ::= <upper_letter> (<letter> | <digit>)*
+<identifier> ::= <letter> (<letter> | <digit>)*
 
 <interface_identifier_list> ::= <interface_identifier> ("," <interface_identifier>)*
 
@@ -14,14 +14,5 @@
 
 <digit> ::= "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"
 
-<symbol> ::= "!" | "@" | "#" | "$" | "%" | "^" | "&" | "*" | "(" | ")" | "-" | "_" | "+" | "=" | "[" | "]" | "{" | "}" | "|" | "\" | ":" | ";" | "<" | ">" | "," | "." | "?" | "/"
+<symbol> ::= "!" | "@" | "#" | "$" | "%" | "^" | "&" | "*" | "(" | ")" | "-" | "_" | "+" | "=" | "[" | "]" | "{" | "}" | "|" | "\\" | ":" | ";" | "<" | ">" | "," | "." | "?" | "/"
 
-<whitespace> ::= <single_line_whitespace> | <multi_line_whitespace> | <comment>
-
-<single_line_whitespace> ::= " " | "\t"
-
-<multi_line_whitespace> ::= "\n" | "\r"
-
-<optional_whitespace> ::= <whitespace>*
-
-<optional_single_line_whitespace ::= (<single_line_whitespace> | <comment>)*
\ No newline at end of file
diff --git a/grammar/core/keywords.bnf b/grammar/core/keywords.bnf
index fde281a..6852fa2 100644
--- a/grammar/core/keywords.bnf
+++ b/grammar/core/keywords.bnf
@@ -2,6 +2,10 @@
 
 <arrow_keyword> ::= "->"
 
+<double_quote> ::= "\""
+
+<single_quote> ::= "'"
+
 <single_line_comment_identifier> ::= "//"
 
 <multi_line_comment_open_identifier> ::= "/*"
@@ -40,7 +44,7 @@
 
 <constructor_method_name> ::= "on_create"
 
-<destructor_name> ::= "on_destroy"
+<destructor_method_name> ::= "on_destroy"
 
 <use_statement_identifier> ::= "use"
 
@@ -60,4 +64,5 @@
 
 <context_management_keyword> ::= "using"
 
-<exception_throw_keyword> ::= "fail"
\ No newline at end of file
+<exception_throw_keyword> ::= "fail"
+
diff --git a/grammar/core/literals.bnf b/grammar/core/literals.bnf
index 5c1d563..d1dac3e 100644
--- a/grammar/core/literals.bnf
+++ b/grammar/core/literals.bnf
@@ -14,16 +14,12 @@
 
 <string_literal> ::= <double_quote_string> | <single_quote_string>
 
-<double_quote_string> ::= <double_quote> <double_quote_content>* <double_quote>
-<single_quote_string> ::= <single_quote> <single_quote_content>* <single_quote>
+<double_quote_string> ::= <double_quote> <double_quote_character>* <double_quote>
 
-<double_quote_content> ::= <double_quote_character> <double_quote_content>
-<single_quote_content> ::= <single_quote_character> <single_quote_content>
-
-<double_quote> ::= "\""
-<single_quote> ::= "'"
+<single_quote_string> ::= <single_quote> <single_quote_character>* <single_quote>
 
 <double_quote_character> ::= <letter> | <digit> | <symbol> | <whitespace>
+
 <single_quote_character> ::= <letter> | <digit> | <symbol> | <whitespace>
 
 <boolean_literal> ::= <true_keyword> | <false_keyword>
@@ -32,4 +28,13 @@
 
 <array_literal> ::= <array_symbol_open> <literal_list>? <array_symbol_close>
 
-<literal_list> ::= <literal> ("," <literal>)*
+<literal_list> ::= <optional_whitespace> <integer_literal_list> | <decimal_literal_list> | <string_literal_list> | <boolean_literal_list> <optional_whitespace>
+
+<integer_literal_list> ::= <integer_literal> <optional_whitespace> ("," <optional_whitespace> <integer_literal>)*
+
+<decimal_literal_list> ::= <decimal_literal> <optional_whitespace> ("," <optional_whitespace> <decimal_literal>)*
+
+<string_literal_list> ::= <string_literal> <optional_whitespace> ("," <optional_whitespace> <string_literal>)*
+
+<boolean_literal_list> ::= <boolean_literal> <optional_whitespace> ("," <optional_whitespace> <boolean_literal>)*
+
diff --git a/grammar/core/visibility.bnf b/grammar/core/visibility.bnf
index 05b8afe..5d9f246 100644
--- a/grammar/core/visibility.bnf
+++ b/grammar/core/visibility.bnf
@@ -2,3 +2,4 @@
     <public_scope_identifier>
     | <protected_scope_identifier>
     | <private_scope_identifier>
+
diff --git a/grammar/core/whitespace.bnf b/grammar/core/whitespace.bnf
new file mode 100644
index 0000000..4061352
--- /dev/null
+++ b/grammar/core/whitespace.bnf
@@ -0,0 +1,16 @@
+<whitespace> ::= <single_line_whitespace> | <multi_line_whitespace>
+
+<single_line_whitespace> ::= " " | "\t" | "\u00A0"
+
+<multi_line_whitespace> ::= "\n" | "\r" | "\u2028" | "\u2029"
+
+<optional_whitespace> ::= <whitespace>*
+
+<optional_single_line_whitespace> ::= <single_line_whitespace>*
+
+<required_single_line_whitespace> ::= <single_line_whitespace>+
+
+<required_multi_line_whitespace> ::= <multi_line_whitespace>+
+
+<required_whitespace> ::= <single_line_whitespace>+ | <multi_line_whitespace>+
+
diff --git a/grammar/declarations/function_declarations.bnf b/grammar/declarations/function_declarations.bnf
index f601983..4a4403b 100644
--- a/grammar/declarations/function_declarations.bnf
+++ b/grammar/declarations/function_declarations.bnf
@@ -1,23 +1,20 @@
 <function_declaration> ::= <optional_whitespace>
                            <accessibility_modifier>
                            <function_keyword>
-                           <optional_whitespace>
+                           <required_single_line_whitespace>
                            <identifier>
                            <optional_whitespace>
                            <function_signature>
                            <optional_whitespace>
-                           "{"
-                           <optional_whitespace>
-                           <statement>*
-                           <optional_whitespace>
-                           "}"
+                           <standard_statement_block>
 
-<function_signature> ::= "(" <parameter_list>? ")" 
-    <arrow_keyword> <return_type_list>
+<function_signature> ::= "(" <parameter_list>? ")" <optional_whitespace> <arrow_keyword> <optional_whitespace> <return_type_list> <optional_whitespace> <function_error_signature>?
 
-<error_type_list> ::= <error_type> ("," <error_type>)*
+<function_error_signature> ::= <function_error_identifier> <required_single_line_whitespace> <error_type_list>
 
-<error_type> ::= <identifier> ("/" <identifier>)?
+<return_type_list> ::= "[" <optional_single_line_whitespace> <type> | <callable_type_keyword> ( <optional_single_line_whitespace> "|" <optional_single_line_whitespace> <null_keyword>)? <optional_single_line_whitespace> "]"
+
+<error_type_list> ::= "[" <optional_single_line_whitespace> <inherited_error_type> ("," <optional_single_line_whitespace> <inherited_error_type>)* "]"
 
 <parameter_list> ::= <parameter_group>?
 
@@ -30,17 +27,19 @@
 <required_parameters> ::=
     <optional_whitespace>
     ( <required_parameter>
-    | <required_parameter> "," <optional_whitespace> <required_parameters> )
+    | <required_parameter> "," <required_parameters> )
 
 <default_parameters> ::=
     <optional_whitespace>
     ( <default_parameter>
     | <default_parameter> "," <default_parameters> )
 
-<required_parameter> ::= <parameter_type> <identifier>
+<required_parameter> ::= <type> <required_single_line_whitespace> <identifier>
 
-<default_parameter> ::= <parameter_type> <identifier> ".default(" <literal> ")"
+<default_parameter> ::= <type> <required_single_line_whitespace> <identifier> ".default(" <literal> ")"
 
-<lambda_declaration> ::= <function_keyword> <optional_whitespace> "(" <parameter_list>? ")"
-    <arrow_keyword> <optional_whitespace> "[" <optional_whitespace> <type> <optional_whitespace> "]"
-    "{" <optional_whitespace> <statement>* <optional_whitespace> "}"
+<lambda_declaration> ::= <function_keyword> <optional_whitespace> "(" <parameter_list>? ")" <function_signature> <standard_statement_block>
+
+<constructor_declaration> ::= <optional_whitespace> <accessibility_modifier> <function_keyword> <required_single_line_whitespace> <constructor_method_name> <optional_whitespace> <function_signature> <optional_whitespace> <standard_statement_block>
+
+<destructor_declaration> ::= <optional_whitespace> <accessibility_modifier> <function_keyword> <required_single_line_whitespace> <destructor_method_name> <optional_whitespace> <function_signature> <optional_whitespace> <standard_statement_block>
diff --git a/grammar/declarations/type_declarations.bnf b/grammar/declarations/type_declarations.bnf
index ac13062..0295a93 100644
--- a/grammar/declarations/type_declarations.bnf
+++ b/grammar/declarations/type_declarations.bnf
@@ -9,12 +9,13 @@
                        "}"
 
 <class_body> ::= <optional_whitespace>
+                 (<comment>*
                  (<variable_declaration>
                  | <constant_declaration>
                  | <function_declaration>
                  | <constructor_declaration>
                  | <destructor_declaration>
-                 | <optional_whitespace>)*
+                 | <optional_whitespace>))*
                  <optional_whitespace>
 
 <inherited_type> ::= (<parent> "/")? <child>
@@ -23,8 +24,6 @@
 
 <child> ::= <identifier>
 
-<type_parameter_list> ::= <identifier> ("," <identifier>)*
-
 <variable_declaration> ::= <optional_whitespace>
                            <type>
                            <optional_whitespace>
@@ -35,13 +34,3 @@
 
 <constant_declaration> ::= <type> <identifier> ".define(" <literal> ");"
 
-<constructor_declaration> ::=
-    <accessibility_modifier> <constructor_name> "(" <parameter_list>? ")"
-    (<function_error_identifier> <error_type_list>)?
-    "{" <statement>* "}"
-
-<destructor_declaration> ::=
-    <accessibility_modifier> <destructor_name> "(" <parameter_list>? ")"
-    (<function_error_identifier> <error_type_list>)?
-    "{" <statement>* "}"
-
diff --git a/grammar/interfaces/interface_definitions.bnf b/grammar/interfaces/interface_definitions.bnf
index d9a8027..7e49e96 100644
--- a/grammar/interfaces/interface_definitions.bnf
+++ b/grammar/interfaces/interface_definitions.bnf
@@ -12,5 +12,3 @@
 
 <interface_implementation> ::= <arrow_keyword> "[" <interface_identifier_list> "]"
 
-<interface_method_signature> ::= 
-    <accessibility_modifier> <function_keyword> <identifier> <function_signature>
diff --git a/grammar/main.bnf b/grammar/main.bnf
index 9e4d126..e0e3b67 100644
--- a/grammar/main.bnf
+++ b/grammar/main.bnf
@@ -1,21 +1,22 @@
 <program> ::= <use_statement>*
+              <optional_whitespace>
+              <comment>*
               <optional_whitespace>
               <top_level_definition>*
               <optional_whitespace>
+              <comment>*
+              <optional_whitespace>
 
 <use_statement> ::= <use_statement_identifier>
-                    <optional_whitespace>
-                    <identifier>
-                    ("." <identifier>)*
+                    <required_single_line_whitespace>
+                    <identifier> ("." <identifier>)*
                     <optional_whitespace> ";"
 
-<top_level_definition> ::= (<type_declaration>
-                           | <interface_declaration>
-                           | <error_declaration>)
-                           <optional_whitespace>
+<top_level_definition> ::= <type_declaration> | <interface_declaration> | <error_declaration>
 
 import "core/keywords.bnf"
 import "core/comments.bnf"
+import "core/whitespace.bnf"
 import "core/base_types.bnf"
 import "core/identifiers.bnf"
 import "core/literals.bnf"
diff --git a/grammar/operations/control_flow.bnf b/grammar/operations/control_flow.bnf
index d162214..9724768 100644
--- a/grammar/operations/control_flow.bnf
+++ b/grammar/operations/control_flow.bnf
@@ -1,15 +1,6 @@
-<statement> ::= <assignment_statement>
-              | <if_statement>
-              | <while_statement>
-              | <loop_statement>
-              | <reverse_loop_statement>
-              | <function_call_statement>
-              | <return_statement>
-              | <using_statement>
-              | <attempt_statement>
-              | <fail_statement>
-
 <statement> ::= <optional_whitespace>
+                <comment>*
+                <optional_whitespace>
                 (<assignment_statement>
                   | <if_statement>
                   | <while_statement>
@@ -21,6 +12,8 @@
                   | <attempt_statement>
                   | <fail_statement>)
                 <optional_whitespace>
+                <comment>*
+                <optional_whitespace>
 
 <assignment_statement> ::= <my_identifier> ".set(" <expression> ")" ";"
 
@@ -30,7 +23,7 @@
                     <optional_whitespace>
                     <boolean_expression>
                     <optional_whitespace> ")"
-                    "{" <statement>* "}"
+                    <standard_statement_block>
                     (<elseif_statement_keyword>
                     <optional_whitespace>
                     "("
@@ -38,37 +31,35 @@
                     <boolean_expression>
                     <optional_whitespace>
                     ")"
-                    "{"
-                    <statement>*
-                    "}"
+                    <standard_statement_block>
                     )?
                     (<else_statement_keyword>
                     <optional_whitespace>
-                    "{"
-                    <statement>*
-                    "}"
+                    <standard_statement_block>
                     )?
 
-<while_statement> ::= <while_loop_keyword> "(" <expression> ")"
-    "{" <statement>* "}"
+<standard_statement_block> ::= <optional_whitespace> "{" <optional_whitespace> <statement>* <optional_whitespace> "}" <optional_whitespace>
+
+<while_statement> ::= <while_loop_keyword> "(" <expression> ")" <standard_statement_block>
 
 <loop_statement> ::= <for_loop_keyword> "(" <identifier> "," <expression> "->" <expression>
     ("," <expression>)? ")"
-    "{" <statement>* "}"
+    <standard_statement_block>
 
 <reverse_loop_statement> ::= <reverse_for_loop_keyword> "(" <identifier> "," <expression> "->" <expression>
     ("," <expression>)? ")"
-    "{" <statement>* "}"
+    <standard_statement_block>
 
 <function_call_statement> ::= <my_identifier> "(" <argument_list>? ")" ";"
 
 <return_statement> ::= <return_statement_keyword> <expression> ";"
 
 <using_statement> ::= <context_management_keyword> <type> <identifier> ".set(" <expression> ")"
-    "{" <statement>* "}"
+    <standard_statement_block>
 
 <attempt_statement> ::= <expression> ".attempt" "{" <attempt_handler>* "}"
 
-<attempt_handler> ::= ("ok" | <identifier> | "error") "{" <statement>* "}"
+<attempt_handler> ::= ("ok" | <identifier> | "error") <standard_statement_block>
+
+<fail_statement> ::= <my_identifier> "." <exception_throw_keyword> "(" <inherited_error_type> ("(" <argument_list>? ")")? ")" ";"
 
-<fail_statement> ::= <my_identifier> "." <exception_throw_keyword> "(" <error_type> ("(" <argument_list>? ")")? ")" ";"
diff --git a/grammar/operations/method_calls.bnf b/grammar/operations/method_calls.bnf
index 9f93717..ebd058b 100644
--- a/grammar/operations/method_calls.bnf
+++ b/grammar/operations/method_calls.bnf
@@ -17,3 +17,4 @@
                 | <identifier>
 
 <argument_list> ::= <expression> ("," <expression>)*
+
diff --git a/scripts/flatten.sh b/scripts/flatten.sh
new file mode 100755
index 0000000..3518394
--- /dev/null
+++ b/scripts/flatten.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Check if input file is provided
+#if [ $# -eq 0 ]; then
+#    echo "Usage: $0 <input_file> [output_file]"
+#    exit 1
+#fi
+
+# Input and output file names
+INPUT_FILE="./working/waddle.bnf"
+OUTPUT_FILE="./working/waddle_flattened.bnf"
+
+# Flatten multi-line BNF definitions
+awk '
+BEGIN {
+    in_definition = 0
+    current_line = ""
+}
+
+/^[[:space:]]*$/ {
+    # Empty line
+    if (in_definition) {
+        # Remove leading/trailing whitespace and collapse internal whitespace
+        gsub(/^[[:space:]]+|[[:space:]]+$/, "", current_line)
+        gsub(/[[:space:]]+/, " ", current_line)
+        print current_line
+        current_line = ""
+        in_definition = 0
+    }
+    next
+}
+
+/^[[:space:]]*import/ {
+    # Print import line as-is
+    print $0
+    next
+}
+
+{
+    in_definition = 1
+    # Append current line to definition, removing leading/trailing whitespace
+    if (current_line == "") {
+        current_line = $0
+    } else {
+        current_line = current_line " " $0
+    }
+}
+
+END {
+    # Handle last definition if exists
+    if (in_definition) {
+        gsub(/^[[:space:]]+|[[:space:]]+$/, "", current_line)
+        gsub(/[[:space:]]+/, " ", current_line)
+        print current_line
+    }
+}
+' "$INPUT_FILE" > "$OUTPUT_FILE"
+
+echo "Flattened BNF saved to $OUTPUT_FILE"
diff --git a/compiler/.gitkeep b/scripts/working/.gitkeep
similarity index 100%
rename from compiler/.gitkeep
rename to scripts/working/.gitkeep