diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/AST_Design.md b/Project/Source/GasaEditor/GasaGen/gencpp/AST_Design.md
index 8b123e9..2f3175a 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/AST_Design.md
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/AST_Design.md
@@ -1,44 +1,58 @@
+## Navigation
+
+[Top](../Readme.md)
+
+<- [docs - General](Readme.md)
+
 ## Current Design
 
 `AST` is the actual managed node object for the library.  
 Its raw and really not meant to be used directly.
 
 All user interaction must be with its pointer so the type they deal with is `AST*`.  
-For user-facing code, they should never be giveen a nullptr. Instead, they should be given a designated `Invalid` AST node.
+In order to abstract away constant use of `AST*` its wrapped in a Code type which can be either:
 
-In order to abstract away constant use of `AST*`, I wanted to provide a wrapper for it.
-
-The simpliest being just a type alias.
-
-```cpp
-using Code = AST*;
+When its the [C generated variant of the library](../gen_c_library/)
+```c
+typedef AST* Code;
+tyepdef AST_<name>* Code<name>;
+...
 ```
 
-This is what the genc library would have to use due to its constraints of a langauge.  
-The actual content per type of AST is covered within [AST_Types.md](AST_Types.md).
-
-These are pure PODS that just have the lay members relevant to the type of AST node they represent.  
-Each of them has a Code type alias specific to it.
-
-Again, the simpliest case for these would be a type alias.
+**or**
 
+For C++:
 ```cpp
-using struct AST_Typedef CodeTypedef;
+struct Code {
+    AST* ast;
+};
+struct Code<name> {
+    ...
+
+    AST_<name>* ast;
+};
 ```
 
-As of November 21st, 2023, the AST has had a strict layout for how its content is laid out.  
-This will be abandoned during its redesign that will occur starting with support for statments & expressions for either execution and type declarations.  
-Having a strict layout is too resctrictive vs allowing each AST type to have maximum control over the layout.
+The full definitions of all asts are within:
 
-The redesign will occur after the following todos are addressed:
+* [`ast.hpp`](../base/components/ast.hpp)
+* [`ast_types.hpp`](../base/components/ast_types.hpp)
+* [`code_types.hpp`](../base/components/code_types.hpp)
 
-* [Improvements Lexer & Token struct#27](https://github.com/Ed94/gencpp/issues/27)
-* [Generalize AST Flags to a single 4-byte flag#42](https://github.com/Ed94/gencpp/issues/42)
-* [AST-Code Object Redesign.#38](https://github.com/Ed94/gencpp/issues/38)
-* [Code-AST Documentation#40](https://github.com/Ed94/gencpp/issues/40)
-* [AST::debug_str() improvements#33](https://github.com/Ed94/gencpp/issues/33)
-* [AST::is_equal implemented and works with singleheader-test#31](https://github.com/Ed94/gencpp/issues/31)
-* [Parser : Add ability to have a parse failure and continue with errors recorded.#35](https://github.com/Ed94/gencpp/issues/35)
-* [Scanner : Add CodeFile#29](https://github.com/Ed94/gencpp/issues/29)
-* [Auxiliary : AST visual debugger#36](https://github.com/Ed94/gencpp/issues/36)
+The C/C++ interface procedures are located with `ast.hpp` (for the Code type), and `code_types.hpp` for all others.
 
+## Serialization
+
+All code types can either serialize using a function of the pattern:
+
+```c
+StrBuilder <prefix>_to_strbuilder(Code code);
+// or
+<prefix>_to_strbuilder(Code code, StrBuilder& result);
+```
+
+Where the first generates strings allocated using Allocator_StringArena and the other appends an existing strings with their backed allocator.
+
+Serialization of for the AST is defined for `Code` in [`ast.chpp`](../base/components/ast.cpp) with `code_to_strbuilder_ptr` & `code_to_strbuilder`.  
+Serializtion for the rest of the code types is within [`code_serialization.cpp`](../base/components/code_serialization.cpp).  
+Gencpp's serialization does not provide coherent formatting of the code. The user should use a formatter after serializing.
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/AST_Types.md b/Project/Source/GasaEditor/GasaGen/gencpp/AST_Types.md
index 3f96ceb..2541162 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/AST_Types.md
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/AST_Types.md
@@ -1,10 +1,16 @@
+## Navigation
+
+[Top](../Readme.md)
+
+<- [docs - General](Readme.md)
+
 # AST Types Documentation
 
 While the Readme for docs covers the data layout per AST, this will focus on the AST types avaialble, and their nuances.
 
 ## Body
 
-These are containers representing a scope body of a definition that can be of the following `ECode` type:
+These are containers representing a scope body of a definition that can be of the following `CodeType` type:
 
 * Class_Body
 * Enum_Body
@@ -19,11 +25,11 @@ These are containers representing a scope body of a definition that can be of th
 Fields:
 
 ```cpp
+StrCached   Name;
 Code           Front;
 Code           Back;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 s32            NumEntries;
 ```
@@ -31,14 +37,15 @@ s32            NumEntries;
 The `Front` member represents the start of the link list and `Back` the end.
 NumEntries is the number of entries in the body.
 
-Parent should have a compatible ECode type for the type of defintion used.
+Parent should have a compatible CodeType type for the type of defintion used.
 
 Serialization:
 
 Will output only the entries, the braces are handled by the parent.
 
 ```cpp
-<Front>...
+<Front>
+...
 <Back>
 ```
 
@@ -49,12 +56,12 @@ Represent standard or vendor specific C/C++ attributes.
 Fields:
 
 ```cpp
-StringCached   Content;
+StrCached   Content;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -73,12 +80,12 @@ Stores a comment.
 Fields:
 
 ```cpp
-StringCached   Content;
+StrCached   Content;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -102,11 +109,11 @@ CodeComment    InlineCmt;  // Only supported by forward declarations
 CodeAttributes Attributes;
 CodeType       ParentType;
 CodeBody       Body;
-CodeType       Prev;       // Used to store references to interfaces
-CodeType       Next;       // Used to store references to interfaces
-parser::Token* Tok;
+StrCached   Name;
+CodeType       Prev;
+CodeType       Next;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 AccessSpec     ParentAccess;
@@ -125,7 +132,7 @@ Serialization:
 };
 ```
 
-You'll notice that only one parent type is supported only with parent access. This library only supports single inheritance, the rest must be done through interfaces.
+You'll notice that only one parent type is supported only with parent access. This library only supports single inheritance, the rest are assumed to be interfaces and are given public acess specifiers.
 
 ## Constructor
 
@@ -134,13 +141,13 @@ Fields:
 ```cpp
 CodeComment    InlineCmt;  // Only supported by forward declarations
 Code           InitializerList;
-CodeParam      Params;
+CodeParams     Params;
 Code           Body;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -171,12 +178,12 @@ Represents a preprocessor define
 Fields:
 
 ```cpp
-StringCached   Content;
+StrCached   Content;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -194,11 +201,11 @@ Fields:
 CodeComment    InlineCmt;
 CodeSpecifiers Specs;
 Code           Body;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -229,24 +236,28 @@ Fields:
 CodeComment    InlineCmt;
 CodeAttributes Attributes;
 CodeType       UnderlyingType;
+Code           UnderlyingTypeMacro;
 CodeBody       Body;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
+StrCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
 
+UnderlyingTypeMacro is a macro the library natively supports: `enum_underlying(type)` that is meant to behave as a wrapper for underlying type assignment.  
+The `enum_underlying_sig` is a `Str` global var that can be set which will be defined within `PreprocessorDefines` and used in `parser_parse_enum` to identify a valid macro.
+
 Serialization:
 
 ```cpp
 // Enum_Fwd
-<ModuleFlags> enum class <Name> : <UnderlyingType>; <InlineCmt>
+<ModuleFlags> enum class <Name> : <UnderlyingType> or <UnderlyingTypeMacro> ; <InlineCmt>
 
 // Enum
-<ModuleFlags> <enum or enum class> <Name> : <UnderlyingType>
+<ModuleFlags> <enum or enum class> <Name> : <UnderlyingType> or <UnderlyingTypeMacro>
 {
     <Body>
 };
@@ -260,12 +271,12 @@ Will be obsolute when function body parsing is implemented.
 Fields:
 
 ```cpp
-StringCached   Content;
+StrCached   Content;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -281,11 +292,11 @@ Fields:
 
 ```cpp
 CodeBody       Body;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -303,12 +314,12 @@ extern "<Name>"
 Fields:
 
 ```cpp
-StringCached   Content;
+StrCached   Content;
+StrCached   Name;
 Code           Prev;
 Code           Next;
 Code           Parent;
-parser::Token* Tok;
-StringCached   Name;
+Token*         Tok;
 CodeT          Type;
 ```
 
@@ -327,11 +338,11 @@ Fields:
 ```cpp
 CodeComment    InlineCmt;
 Code           Declaration;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -350,13 +361,13 @@ CodeComment    InlineCmt;
 CodeAttributes Attributes;
 CodeSpecifiers Specs;
 CodeType       ReturnType;
-CodeParam      Params;
+CodeParams     Params;
 CodeBody       Body;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -379,11 +390,11 @@ Serialization:
 Fields:
 
 ```cpp
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -400,11 +411,11 @@ Fields:
 
 ```cpp
 CodeBody       Body;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -418,7 +429,7 @@ Serialization:
 }
 ```
 
-## Operator Overload
+## Operator Overload (Operator)
 
 Fields:
 
@@ -427,13 +438,13 @@ CodeComment    InlineCmt;
 CodeAttributes Attributes;
 CodeSpecifiers Specs;
 CodeType       ReturnType;
-CodeParam      Params;
+CodeParams     Params;
 CodeBody       Body;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 OperatorT      Op;
@@ -452,7 +463,7 @@ Serialization:
 }
 ```
 
-## Operator Cast Overload ( User-Defined Type Conversion )
+## Operator Cast Overload ( User-Defined Type Conversion, OpCast )
 
 Fields:
 
@@ -461,11 +472,11 @@ CodeComment    InlineCmt;
 CodeSpecifiers Specs;
 CodeType       ValueType;
 CodeBody       Body;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -482,7 +493,7 @@ Serialization:
 }
 ```
 
-## Parameters (AST_Param)
+## Parameters (AST_Params)
 
 Fields:
 
@@ -490,11 +501,12 @@ Fields:
 CodeType       ValueType;
 Code           Macro;
 Code           Value;
-CodeParam      Last;
-CodeParam      Next;
-parser::Token* Tok;
+Code           PostNameMacro;
+StrCached   Name;
+CodeParams     Last;
+CodeParams     Next;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 s32            NumEntries;
 ```
@@ -504,7 +516,7 @@ Serialization:
 ```cpp
 <Macro>, <Next> ... <Last>
 
-<Macro> <ValueType> <Name>, <Next>... <Last>
+<Macro> <ValueType> <Name> <PostNameMacro> = <Value>, <Next>... <Last>
 ```
 
 ## Pragma
@@ -512,12 +524,12 @@ Serialization:
 Fields:
 
 ```cpp
-StringCached   Content;
+StrCached   Content;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ```
 
@@ -532,12 +544,12 @@ Serialization:
 Fields:
 
 ```cpp
-StringCached  Content;
+StrCached  Content;
+StrCached  Name;
 Code          Prev;
 Code          Next;
-paser::Token* Tok;
+Token*        Tok;
 Code          Parent;
-StringCached  Name;
 CodeT         Type;
 ```
 
@@ -552,13 +564,13 @@ Serialization:
 Fields:
 
 ```cpp
-SpecifierT     ArrSpecs[ AST::ArrSpecs_Cap ];
+SpecifierT     ArrSpecs[ AST_ArrSpecs_Cap ];
 CodeSpecifiers NextSpecs;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 s32            NumEntries;
 ```
@@ -574,13 +586,13 @@ Serialization:
 Fields:
 
 ```cpp
-CodeParam      Params;
+CodeParams     Params;
 Code           Declaration;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -603,23 +615,30 @@ Fields:
 CodeAttributes Attributes;
 CodeSpecifiers Specs;
 CodeReturnType ReturnType;
-CodeParam      Params;
+CodeParams     Params;
 Code           ArrExpr;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
+StrCached   Name;
 CodeT          Type;
 b32            IsParamPack;
+ETypenameTag   TypeTag;
 ```
 
 Serialization:
 
 ```cpp
-<Attributes> <Name> <Specs> <IsParamPack ?: ...>
+<Attributes> <TypeTag> <Name> <Specs> <IsParamPack ?: ...> 
+// Function
+<Attributes> <ReturnType> <Name> <Params> <Specs>
 ```
 
+`<Name>` currently has the full serialization of anything with
+
+*Note: ArrExpr is not used in serialization by `typename_to_strbuilder_ref` its instead handled by a parent AST's serailization (variable, typedef, using).*
+
 ## Typedef
 
 Behave as usual except function or macro typedefs.  
@@ -630,11 +649,11 @@ Fields:
 ```cpp
 CodeComment   InlineCmt;
 Code          UnderlyingType;
+StrCached  Name;
 Code          Prev;
 Code          Next;
-parse::Token* Tok
+Token*        Tok
 Code          Parent;
-StringCached  Name;
 CodeT         Type;
 ModuleFlag    ModuleFlags;
 b32           IsFunction;
@@ -644,11 +663,16 @@ Serialization:
 
 ```cpp
 // Regular
-<ModuleFlags> typedef <UnderlyingType> <Name>; <InlineCmt>
+<ModuleFlags> typedef <UnderlyingType> <Name> <UnderlyingType-ArrExpr>; <InlineCmt>
 
 // Functions
-<ModuleFlags> typedef <ReturnType> <Name>( <Parameters> ); <InlineCmt>
-<ModuleFlags> typedef <ReturnType> ( <Expression that yeilds an Identifier signature> )( <Parameters> ); <InlineCmt>
+
+// Currently:
+<ModuleFlags> typedef <UnderlyingType (Serialized expression)>; <InlineCmt>
+
+// Desired: Not handled yet
+<ModuleFlags> typedef <UnderlyingType->ReturnType> UnderlyingType->Name> <UnderlyingType-ArrExpr> ( <UnderlyingType->Parameters> ); <InlineCmt>
+<ModuleFlags> typedef <UnderlyingType->ReturnType> ( <Name->Namespace> for<Specs->has(Spec_Ptr) ?: *> <UnderlyingType->Name> <UnderlyingType-ArrExpr> ) ( <UnderlyingType->Parameters> ); <InlineCmt>
 ```
 
 ## Union
@@ -658,11 +682,11 @@ Fields:
 ```cpp
 CodeAttributes Attributes;
 CodeBody       Body;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -684,11 +708,11 @@ Fields:
 CodeComment    InlineCmt;
 CodeAttributes Attributes;
 CodeType       UnderlyingType;
+StrCached   Name;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
 ```
@@ -716,14 +740,15 @@ CodeSpecifiers Specs;
 CodeType       ValueType;
 Code           BitfieldSize;
 Code           Value;
+StrCached   Name;
 CodeVar        NextVar;
 Code           Prev;
 Code           Next;
-parser::Token* Tok;
+Token*         Tok;
 Code           Parent;
-StringCached   Name;
 CodeT          Type;
 ModuleFlag     ModuleFlags;
+s32            VarParenthesizedInit;
 ```
 
 Serialization:
@@ -734,4 +759,7 @@ Serialization:
 
 // Bitfield
 <ModuleFlags> <Attributes> <Specs> <ValueType> <Name> : <BitfieldSize> = <Value>, NextVar ...; <InlineCmt>
+
+// VarParenthesizedInit
+<Attributes> <Specs> <ValueType> <Name>( <Value>, NextVar ... ); <InlineCmt>
 ```
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/Parser_Algo.md b/Project/Source/GasaEditor/GasaGen/gencpp/Parser_Algo.md
index d085f3b..8180168 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/Parser_Algo.md
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/Parser_Algo.md
@@ -1,3 +1,9 @@
+## Navigation
+
+[Top](../Readme.md)
+
+<- [docs - General](Readme.md)
+
 # Parser's Algorithim
 
 gencpp uses a hand-written recursive descent parser. Both the lexer and parser currently handle a full C/C++ file in a single pass.
@@ -6,8 +12,8 @@ gencpp uses a hand-written recursive descent parser. Both the lexer and parser c
 
 ### Lexer
 
-The lex procedure does the lexical pass of content provided as a `StrC` type.
-The tokens are stored (for now) in `gen::parser::Tokens`.
+The lex procedure does the lexical pass of content provided as a `Str` type.  
+The tokens are stored (for now) in `Lexer_Tokens`.
 
 Fields:
 
@@ -16,7 +22,7 @@ Array<Token> Arr;
 s32          Idx;
 ```
 
-What token types are supported can be found in [ETokType.csv](../project/enums/ETokType.csv) you can also find the token types in [ETokType.h](../project/components/gen/etoktype.cpp) , which is the generated enum from the csv file.
+What token types are supported can be found in [ETokType.csv](../base/enums/ETokType.csv) you can also find the token types in [ETokType.h](../base/components/gen/etoktype.cpp) , which is the generated enum from the csv file.
 
 Tokens are defined with the struct `gen::parser::Token`:
 
@@ -69,7 +75,7 @@ The parser has a limited user interface, only specific types of definitions or s
 Each public user interface procedure has the following format:
 
 ```cpp
-<code type> parse_<definition type>( StrC def )
+<code type> parse_<definition type>( Str def )
 {
     check_parse_args( def );
     using namespace Parser;
@@ -281,7 +287,7 @@ In the future statements and expressions will be parsed.
         1. Attributes ( Standard, GNU, MSVC, Macro ) : `parse_attributes`
         2. Specifiers ( consteval, constexpr, constinit, extern, forceinline, global, inline, internal_linkage, neverinline, static )
         3. Is either ( identifier, const specifier, long, short, signed, unsigned, bool, char, double, int)
-            1. Attempt to parse as constrcutor or destructor : `parse_global_nspace_constructor_destructor`
+            1. Attempt to parse as construtor or destructor : `parse_global_nspace_constructor_destructor`
             2. If its an operator cast (definition outside class) : `parse_operator_cast`
             3. Its an operator, function, or varaible : `parse_operator_function_or_varaible`
 4. If its not a global body, consume the closing curly brace
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/Parsing.md b/Project/Source/GasaEditor/GasaGen/gencpp/Parsing.md
index 3c2348a..c29fc17 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/Parsing.md
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/Parsing.md
@@ -1,33 +1,39 @@
+## Navigation
+
+[Top](../Readme.md)
+
+<- [docs - General](Readme.md)
+
 # Parsing
 
-The library features a naive parser tailored for only what the library needs to construct the supported syntax of C++ into its AST.
+The library features a naive single-pass parser tailored for only what the library needs to construct the supported syntax of C++ into its AST for *"front-end"* meta-programming purposes.
 
-This parser does not, and should not do the compiler's job. By only supporting this minimal set of features, the parser is kept (so far) around ~5600 loc. I hope to keep it under 10k loc worst case.
+This parser does not, and should not do the compiler's job. By only supporting this minimal set of features, the parser is kept (so far) around ~7000 loc. I hope to keep it under 10k loc worst case.
 
-You can think of this parser of a frontend parser vs a semantic parser. Its intuitively similar to WYSIWYG. What you precerive as the syntax from the user-side before the compiler gets a hold of it, is what you get.
+You can think of this parser as *frontend parser* vs a *semantic parser*. Its intuitively similar to WYSIWYG. What you ***precerive*** as the syntax from the user-side before the compiler gets a hold of it, is what you get.
 
 User exposed interface:
 
 ```cpp
-CodeClass       parse_class        ( StrC class_def       );
-CodeConstructor parse_constructor  ( StrC constructor_def );
-CodeDestructor  parse_destructor   ( StrC destructor_def  );
-CodeEnum        parse_enum         ( StrC enum_def        );
-CodeBody        parse_export_body  ( StrC export_def      );
-CodeExtern      parse_extern_link  ( StrC exten_link_def  );
-CodeFriend      parse_friend       ( StrC friend_def      );
-CodeFn          parse_function     ( StrC fn_def          );
-CodeBody        parse_global_body  ( StrC body_def        );
-CodeNS          parse_namespace    ( StrC namespace_def   );
-CodeOperator    parse_operator     ( StrC operator_def    );
-CodeOpCast      parse_operator_cast( StrC operator_def    );
-CodeStruct      parse_struct       ( StrC struct_def      );
-CodeTemplate    parse_template     ( StrC template_def    );
-CodeType        parse_type         ( StrC type_def        );
-CodeTypedef     parse_typedef      ( StrC typedef_def     );
-CodeUnion       parse_union        ( StrC union_def       );
-CodeUsing       parse_using        ( StrC using_def       );
-CodeVar         parse_variable     ( StrC var_def         );
+CodeClass       parse_class        ( Str class_def       );
+CodeConstructor parse_constructor  ( Str constructor_def );
+CodeDestructor  parse_destructor   ( Str destructor_def  );
+CodeEnum        parse_enum         ( Str enum_def        );
+CodeBody        parse_export_body  ( Str export_def      );
+CodeExtern      parse_extern_link  ( Str exten_link_def  );
+CodeFriend      parse_friend       ( Str friend_def      );
+CodeFn          parse_function     ( Str fn_def          );
+CodeBody        parse_global_body  ( Str body_def        );
+CodeNS          parse_namespace    ( Str namespace_def   );
+CodeOperator    parse_operator     ( Str operator_def    );
+CodeOpCast      parse_operator_cast( Str operator_def    );
+CodeStruct      parse_struct       ( Str struct_def      );
+CodeTemplate    parse_template     ( Str template_def    );
+CodeType        parse_type         ( Str type_def        );
+CodeTypedef     parse_typedef      ( Str typedef_def     );
+CodeUnion       parse_union        ( Str union_def       );
+CodeUsing       parse_using        ( Str using_def       );
+CodeVar         parse_variable     ( Str var_def         );
 ```
 
 To parse file buffers, use the `parse_global_body` function.
@@ -47,10 +53,11 @@ The keywords supported for the preprocessor are:
 * endif
 * pragma
 
-Each directive `#` line is considered one preproecessor unit, and will be treated as one Preprocessor AST. *These ASTs will be considered members or entries of braced scope they reside within*.  
+Each directive `#` line is considered one preproecessor unit, and will be treated as one Preprocessor AST. 
 If a directive is used with an unsupported keyword its will be processed as an untyped AST.
 
-The preprocessor lines are stored as members of their associated scope they are parsed within. ( Global, Namespace, Class/Struct )
+The preprocessor lines are stored as members of their associated scope they are parsed within. ( Global, Namespace, Class/Struct )  
+***Again (Its not standard): These ASTs will be considered members or entries of braced scope they reside within***
 
 Any preprocessor definition abuse that changes the syntax of the core language is unsupported and will fail to parse if not kept within an execution scope (function body, or expression assignment).  
 Exceptions:
@@ -59,6 +66,8 @@ Exceptions:
   * Disable with: `#define GEN_PARSER_DISABLE_MACRO_FUNCTION_SIGNATURES`
 * typedefs allow for a preprocessed macro: `typedef MACRO();`
   * Disable with: `#define GEN_PARSER_DISABLE_MACRO_TYPEDEF`
+* Macros can behave as typenames
+* There is some macro support in paramters for functions or templates *(Specifically added to support parsing Unreal Engine source)*.
 
 *(Exceptions are added on an on-demand basis)*
 *(See functions `parse_operator_function_or_variable` and `parse_typedef` )*
@@ -67,15 +76,23 @@ Adding your own exceptions is possible by simply modifying the parser to allow f
 
 *Note: You could interpret this strictness as a feature. This would allow the user to see if their codebase or a third-party's codebase some some egregious preprocessor abuse.*
 
+If a macro is not defined withint e scope of parsing a set of files, it can be defined beforehand by:
+
+* Appending the [`PreprocessorDefines`](https://github.com/Ed94/gencpp/blob/a18b5b97aa5cfd20242065cbf53462a623cd18fa/base/components/header_end.hpp#L137) array.
+  * For functional macros a "(" just needs to be added after the name like: `<name>(` so that it will tokenize its arguments as part of the token during lexing.
+* Defining a CodeDefine using `def_define`. The definition will be processed by the interface for user into `PreprocessorDefines`.
+  * This can be prevented by setting the optional prameter `dont_append_preprocess_defines`.
+
 The lexing and parsing takes shortcuts from whats expected in the standard.
 
 * Numeric literals are not checked for validity.
-* The parse API treats any execution scope definitions with no validation and are turned into untyped Code ASTs.
+* The parse API treats any execution scope definitions with no validation and are turned into untyped Code ASTs. (There is a [todo](https://github.com/Ed94/gencpp/issues/49) to add support)
   * *This includes the assignment of variables.*
 * Attributes ( `[[]]` (standard), `__declspec` (Microsoft), or `__attribute__` (GNU) )
   * Assumed to *come before specifiers* (`const`, `constexpr`, `extern`, `static`, etc) for a function or right afterthe return type.
   * Or in the usual spot for class, structs, (*right after the declaration keyword*)
   * typedefs have attributes with the type (`parse_type`)
 * Parsing attributes can be extended to support user defined macros by defining `GEN_DEFINE_ATTRIBUTE_TOKENS` (see `gen.hpp` for the formatting)
+  * This is useful for example: parsing Unreal `Module_API` macros.
 
 Empty lines used throughout the file are preserved for formatting purposes during ast serialization.
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/Readme.md b/Project/Source/GasaEditor/GasaGen/gencpp/Readme.md
index 20d84fd..7be3fd6 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/Readme.md
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/Readme.md
@@ -1,137 +1,17 @@
-# gencpp
+## Navigation
 
-An attempt at simple staged metaprogramming for c/c++.
+# base
 
-The library API is a composition of code element constructors.  
-These build up a code AST to then serialize with a file builder.
+[Top](../Readme.md)
 
-This code base attempts follow the [handmade philosophy](https://handmade.network/manifesto).  
-Its not meant to be a black box metaprogramming utility, it should be easy to intergrate into a user's project domain.  
+* [docs](../docs/Readme.md)
 
-## Notes
+# Unreal Engine Version Generator
 
-**On Partial Hiatus: Life has got me tackling other issues..**  
-I will be passively updating the library with bug fixes and minor improvements as I use it for my personal projects.  
-There won't be any major reworks or features to this thing for a while.
+This generates a variant of gencpp thats compatiable with use as a thirdparty module within a plugin or module of an Unreal Project or the Engine itself.
 
-This project is still in development (very much an alpha state), so expect bugs and missing features.  
-See [issues](https://github.com/Ed94/gencpp/issues) for a list of known bugs or todos.
-
-The library can already be used to generate code just fine, but the parser is where the most work is needed. If your C++ isn't "down to earth" expect issues.
-
-A `natvis` and `natstepfilter` are provided in the scripts directory (its outdated, I'll update this readme when its not).
-
-***The editor and scanner have not been implemented yet. The scanner will come first, then the editor.***
-
-A C variant is hosted [here](https://github.com/Ed94/genc); I will complete it when this library is feature complete, it should be easier to make than this...
-
-## Usage
-
-A metaprogram is built to generate files before the main program is built. We'll term runtime for this program as `GEN_TIME`. The metaprogram's core implementation are within `gen.hpp` and `gen.cpp` in the project directory.
-
-`gen.cpp` \`s  `main()` is defined as `gen_main()` which the user will have to define once for their program. There they will dictate everything that should be generated.
-
-In order to keep the locality of this code within the same files the following pattern may be used (although this pattern isn't required at all):
-
-Within `program.cpp` :
-
-```cpp
-#ifdef GEN_TIME
-#include "gen.hpp"
-
-...
-
-u32 gen_main()
-{
-    ...
-}
-#endif
-
-// "Stage" agnostic code.
-
-#ifndef GEN_TIME
-#include "program.gen.cpp"
-
-    // Regular runtime dependent on the generated code here.
-#endif
+If using the library's provided build scripts:
 
+```ps1
+.\build.ps1 <compiler> <debug or omit> unreal
 ```
-
-The design uses a constructive builder API for the code to generate.  
-The user is provided `Code` objects that are used to build up the AST.
-
-Example using each construction interface:
-
-### Upfront
-
-Validation and construction through a functional interface.
-
-```cpp
-Code t_uw           = def_type( name(usize) );
-Code t_allocator    = def_type( name(allocator) );
-Code t_string_const = def_type( name(char), def_specifiers( args( ESpecifier::Const, ESpecifier::Ptr ) ));
-
-Code header;
-{
-    Code num       = def_variable( t_uw,        name(Num) );
-    Code cap       = def_variable( t_uw,        name(Capacity) );
-    Code mem_alloc = def_variable( t_allocator, name(Allocator) );
-    Code body      = def_struct_body( args( num, cap, mem_alloc ) );
-
-    header = def_struct( name(ArrayHeader), __, __, body );
-}
-```
-
-### Parse
-
-Validation through ast construction.
-
-```cpp
-Code header = parse_struct( code(
-    struct ArrayHeader
-    {
-        usize        Num;
-        usize        Capacity;
-        allocator Allocator;
-    };
-));
-
-```
-
-### Untyped
-
-No validation, just glorified text injection.
-
-```cpp
-Code header = code_str(
-    struct ArrayHeader
-    {
-        usize        Num;
-        usize        Capacity;
-        allocator Allocator;
-    };
-);
-```
-
-`name` is a helper macro for providing a string literal with its size, intended for the name parameter of functions.  
-`code` is a helper macro for providing a string literal with its size, but intended for code string parameters.  
-`args` is a helper macro for providing the number of arguments to varadic constructors.
-`code_str` is a helper macro for writting `untyped_str( code( <content> ))`
-
-All three constrcuton interfaces will generate the following C code:
-
-```cpp
-struct ArrayHeader
-{
-    usize        Num;
-    usize        Capacity;
-    allocator Allocator;
-};
-```
-
-**Note: The formatting shown here is not how it will look. For your desired formatting its recommended to run a pass through the files with an auto-formatter.**
-*(The library currently uses clang-format for formatting, beware its pretty slow...)*
-
-## Building
-
-See the [scripts directory](scripts/).
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/Readme_Docs.md b/Project/Source/GasaEditor/GasaGen/gencpp/Readme_Docs.md
index 7f2da37..4655f0a 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/Readme_Docs.md
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/Readme_Docs.md
@@ -1,62 +1,42 @@
-## Documentation
+# General Docs
 
-The project has no external dependencies beyond:
+[Top](../Readme.md)
 
-* `errno.h`
-* `stat.h`
-* `stdarg.h`
-* `stddef.h`
-* `stdio.h`
-* `copyfile.h` (Mac)
-* `types.h`    (Linux)
-* `unistd.h`   (Linux/Mac)
-* `intrin.h`   (Windows)
-* `io.h`       (Windows with gcc)
-* `windows.h`  (Windows)
+Contains:
 
-Dependencies for the project are wrapped within `GENCPP_ROLL_OWN_DEPENDENCIES` (Defining it will disable them).  
-The majority of the dependency's implementation was derived from the [c-zpl library](https://github.com/zpl-c/zpl).
+* [AST_Design](./AST_Design.md): Overview of ASTs
+* [AST Types](./AST_Types.md): Listing of all AST types along with their Code type interface.
+* [Parsing](./Parsing.md): Overview of the parsing interface.
+* [Parser Algo](./Parser_Algo.md): In-depth breakdown of the parser's implementation.
 
-This library was written in a subset of C++ where the following are not used at all:
-
-* RAII (Constructors/Destructors), lifetimes are managed using named static or regular functions.
-* Language provide dynamic dispatch, RTTI
-* Object-Oriented Inheritance
-* Exceptions
-
-Polymorphic & Member-functions are used as an ergonomic choice, along with a conserative use of operator overloads.  
-There are only 4 template definitions in the entire library. (`Array<Type>`, `Hashtable<Type>`, `swap<Type>`, and `AST/Code::cast<Type>`)
-
-Two generic templated containers are used throughout the library:
-
-* `template< class Type> struct Array`
-* `template< class Type> struct HashTable`
-
-Both Code and AST definitions have a `template< class Type> Code/AST :: cast()`. Its just an alternative way to explicitly cast to each other.
-
-`template< class Type> swap( Type& a, Type& b)` is used over a macro.
-
-Otherwise the library is free of any templates.
-
-### *WHAT IS NOT PROVIDED*
+### *CURRENTLY UNSUPPORTED*
 
 **There is no support for validating expressions.**  
-Its difficult to parse without enough benefits (At the metaprogramming level).  
-I plan to add this only at the tail of the project parsing milestone.
+Its a [todo](https://github.com/Ed94/gencpp/issues/49)
 
-**Only trivial template support is provided.**  
-The intention is for only simple, non-recursive substitution.  
-The parameters of the template are treated like regular parameter AST entries.  
+**Only trivial template support is provided.**
+The intention is for only simple, non-recursive substitution.
+The parameters of the template are treated like regular parameter AST entries.
 This means that the typename entry for the parameter AST would be either:
 
 * `class`
 * `typename`
 * A fundamental type, function, or pointer type.
 
-Anything beyond this usage is not supported by parse_template for arguments (at least not intentionally).  
-Use at your own mental peril.
+***Concepts and Constraints are not supported***  
+Its a [todo](https://github.com/Ed94/gencpp/issues/21)
 
-*Concepts and Constraints are not supported, its usage is non-trivial substitution.*
+### Feature Macros:
+
+* `GEN_DEFINE_ATTRIBUTE_TOKENS` : Allows user to define their own attribute macros for use in parsing.
+  * This can be generated using base.cpp.
+* `GEN_DEFINE_LIBRARY_CORE_CONSTANTS` : Optional typename codes as they are non-standard to C/C++ and not necessary to library usage
+* `GEN_DONT_ENFORCE_GEN_TIME_GUARD` : By default, the library ( gen.hpp/ gen.cpp ) expects the macro `GEN_TIME` to be defined, this disables that.
+* `GEN_ENFORCE_STRONG_CODE_TYPES` : Enforces casts to filtered code types.
+* `GEN_EXPOSE_BACKEND` : Will expose symbols meant for internal use only.
+* `GEN_ROLL_OWN_DEPENDENCIES` : Optional override so that user may define the dependencies themselves.
+* `GEN_DONT_ALLOW_INVALID_CODE` (Not implemented yet) : Will fail when an invalid code is constructed, parsed, or serialized.
+* `GEN_C_LIKE_PP` : Setting to `<true or 1>` Will prevent usage of function defnitions using references and structs with member functions. Structs will still have user-defined operator conversions, for-range support, and other operator overloads
 
 ### The Data & Interface
 
@@ -65,87 +45,33 @@ As mentioned in root readme, the user is provided Code objects by calling the co
 The AST is managed by the library and provided to the user via its interface.  
 However, the user may specifiy memory configuration.
 
-Data layout of AST struct (Subject to heavily change with upcoming redesign):
+[Data layout of AST struct (Subject to heavily change with upcoming todos)](../base/components/ast.hpp#L396-461)  
 
-```cpp
-union {
-    struct
-    {
-        AST*      InlineCmt;       // Class, Constructor, Destructor, Enum, Friend, Functon, Operator, OpCast, Struct, Typedef, Using, Variable
-        AST*      Attributes;      // Class, Enum, Function, Struct, Typedef, Union, Using, Variable
-        AST*      Specs;           // Destructor, Function, Operator, Typename, Variable
-        union {
-            AST*  InitializerList; // Constructor
-            AST*  ParentType;      // Class, Struct, ParentType->Next has a possible list of interfaces.
-            AST*  ReturnType;      // Function, Operator, Typename
-            AST*  UnderlyingType;  // Enum, Typedef
-            AST*  ValueType;       // Parameter, Variable
-        };
-        union {
-            AST*  Macro;           // Parameters
-            AST*  BitfieldSize;    // Variable (Class/Struct Data Member)
-            AST*  Params;          // Constructor, Function, Operator, Template, Typename
-        };
-        union {
-            AST*  ArrExpr;          // Typename
-            AST*  Body;             // Class, Constructr, Destructor, Enum, Function, Namespace, Struct, Union
-            AST*  Declaration;      // Friend, Template
-            AST*  Value;            // Parameter, Variable
-        };
-        union {
-            AST*  NextVar;          // Variable; Possible way to handle comma separated variables declarations. ( , NextVar->Specs NextVar->Name NextVar->ArrExpr = NextVar->Value )
-            AST*  SpecsFuncSuffix;  // Only used with typenames, to store the function suffix if typename is function signature.
-        };
-    };
-    StringCached  Content;          // Attributes, Comment, Execution, Include
-    struct {
-        SpecifierT ArrSpecs[AST::ArrSpecs_Cap]; // Specifiers
-        AST*       NextSpecs;                   // Specifiers
-    };
-};
-union {
-    AST* Prev;
-    AST* Front;
-    AST* Last;
-};
-union {
-    AST* Next;
-    AST* Back;
-};
-AST*              Parent;
-StringCached      Name;
-CodeT             Type;
-ModuleFlag        ModuleFlags;
-union {
-    b32           IsFunction;  // Used by typedef to not serialize the name field.
-    b32           IsParamPack; // Used by typename to know if type should be considered a parameter pack.
-    OperatorT     Op;
-    AccessSpec    ParentAccess;
-    s32           NumEntries;
-};
-s32               Token;       // Handle to the token, stored in the CodeFile (Otherwise unretrivable)
-```
+https://github.com/Ed94/gencpp/blob/eea4ebf5c40d5d87baa465abfb1be30845b2377e/base/components/ast.hpp#L396-L461
 
-*`CodeT` is a typedef for `ECode::Type` which has an underlying type of `u32`*  
+*`StringCahced` is a typedef for `Str` (a string slice), to denote it is an interned string*  
+*`CodeType` is enum taggin the type of code. Has an underlying type of `u32`*  
 *`OperatorT` is a typedef for `EOperator::Type` which has an underlying type of `u32`*  
-*`StringCahced` is a typedef for `String const`, to denote it is an interned string*  
-*`String` is the dynamically allocated string type for the library*
+*`StrBuilder` is the dynamically allocated string type for the library*  
 
-AST widths are setup to be AST_POD_Size.
+AST widths are setup to be AST_POD_Size.  
 The width dictates how much the static array can hold before it must give way to using an allocated array:
 
 ```cpp
 constexpr static
-usize ArrSpecs_Cap =
+int AST_ArrSpecs_Cap =
 (
     AST_POD_Size
-    - sizeof(AST*) * 3
-    - sizeof(StringCached)
-    - sizeof(CodeT)
+    - sizeof(Code)
+    - sizeof(StrCached)
+    - sizeof(Code) * 2
+    - sizeof(Token*)
+    - sizeof(Code)
+    - sizeof(CodeType)
     - sizeof(ModuleFlag)
     - sizeof(u32)
 )
-/ sizeof(SpecifierT) -1; // -1 for 4 extra bytes (Odd num of AST*)
+/ sizeof(Specifier) - 1;
 ```
 
 *Ex: If the AST_POD_Size is 128 the capacity of the static array is 20.*
@@ -153,8 +79,8 @@ usize ArrSpecs_Cap =
 Data Notes:
 
 * The allocator definitions used are exposed to the user incase they want to dictate memory usage
-  * You'll find the memory handling in `init`, `deinit`, `reset`, `gen_string_allocator`, `get_cached_string`, `make_code`.
-  * Allocators are defined with the `AllocatorInfo` structure found in `dependencies\memory.hpp`
+  * You'll find the memory handling in `init`, `deinit`, `reset`, `gen_strbuilder_allocator`, `cache_str`, `make_code`.
+  * Allocators are defined with the `AllocatorInfo` structure found in [`memory.hpp`](../base/dependencies/memory.hpp)
   * Most of the work is just defining the allocation procedure:
 
 ```cpp
@@ -162,30 +88,30 @@ Data Notes:
 ```
 
 * ASTs are wrapped for the user in a Code struct which is a wrapper for a AST* type.
-* Both AST and Code have member symbols but their data layout is enforced to be POD types.
+* Code types have member symbols but their data layout is enforced to be POD types.
 * This library treats memory failures as fatal.
 * Cached Strings are stored in their own set of arenas. AST constructors use cached strings for names, and content.
   * `StringArenas`, `StringCache`, `Allocator_StringArena`, and `Allocator_StringTable` are the associated containers or allocators.
 * Strings used for serialization and file buffers are not contained by those used for cached strings.
-  * They are currently using `GlobalAllocator`, which are tracked array of arenas that grows as needed (adds buckets when one runs out).
+  * They are currently using `FallbackAllocator`, which are tracked array of arenas that grows as needed (adds buckets when one runs out).
   * Memory within the buckets is not reused, so its inherently wasteful.
-  * I will be augmenting the single arena with a simple slag allocator.
-* Linked lists used children nodes on bodies, and parameters.
+  * I will be augmenting the default allocator with virtual memory & a slab allocator in the [future](https://github.com/Ed94/gencpp/issues/12)
+* Intrusive linked lists used children nodes on bodies, and parameters.
 * Its intended to generate the AST in one go and serialize after. The constructors and serializer are designed to be a "one pass, front to back" setup.
-* Allocations can be tuned by defining the folloiwng macros:
+* Allocations can be tuned by defining the folloiwng macros (will be moved to runtime configuration in the future):
   * `GEN_GLOBAL_BUCKET_SIZE` : Size of each bucket area for the global allocator
   * `GEN_CODEPOOL_NUM_BLOCKS` : Number of blocks per code pool in the code allocator
   * `GEN_SIZE_PER_STRING_ARENA` : Size per arena used with string caching.
   * `GEN_MAX_COMMENT_LINE_LENGTH` : Longest length a comment can have per line.
   * `GEN_MAX_NAME_LENGTH` : Max length of any identifier.
   * `GEN_MAX_UNTYPED_STR_LENGTH` : Max content length for any untyped code.
-  * `GEN_TOKEN_FMT_TOKEN_MAP_MEM_SIZE` : token_fmt_va uses local_persit memory of this size for the hashtable.
+  * `TokenMap_FixedArena` : token_fmt_va uses local_persit memory of this arena type for the hashtable.
   * `GEN_LEX_ALLOCATOR_SIZE`
   * `GEN_BUILDER_STR_BUFFER_RESERVE`
 
 The following CodeTypes are used which the user may optionally use strong typing with if they enable: `GEN_ENFORCE_STRONG_CODE_TYPES`
 
-* CodeBody : Has support for `for-range` iterating across Code objects.
+* CodeBody : Has support for `for : range` iterating across Code objects.
 * CodeAttributes
 * CodeComment
 * CodeClass
@@ -202,13 +128,13 @@ The following CodeTypes are used which the user may optionally use strong typing
 * CodeNS
 * CodeOperator
 * CodeOpCast
-* CodeParam : Has support for `for-range` iterating across parameters.
+* CodeParams : Has support for `for : range` iterating across parameters.
 * CodePreprocessCond
 * CodePragma
-* CodeSpecifiers : Has support for `for-range` iterating across specifiers.
+* CodeSpecifiers : Has support for `for : range` iterating across specifiers.
 * CodeStruct
 * CodeTemplate
-* CodeType
+* CodeTypename
 * CodeTypedef
 * CodeUnion
 * CodeUsing
@@ -293,6 +219,7 @@ Code <name>
 ```
 
 When using the body functions, its recommended to use the args macro to auto determine the number of arguments for the varadic:
+
 ```cpp
 def_global_body( args( ht_entry, array_ht_entry, hashtable ));
 
@@ -300,7 +227,7 @@ def_global_body( args( ht_entry, array_ht_entry, hashtable ));
 def_global_body( 3, ht_entry, array_ht_entry, hashtable );
 ```
 
-If a more incremental approach is desired for the body ASTs, `Code def_body( CodeT type )` can be used to create an empty body.  
+If a more incremental approach is desired for the body ASTs, `Code def_body( CodeT type )` can be used to create an empty body.
 When the members have been populated use: `AST::validate_body` to verify that the members are valid entires for that type.
 
 ### Parse construction
@@ -352,7 +279,7 @@ Interface :
 * untyped_fmt
 * untyped_token_fmt
 
-During serialization any untyped Code AST has its string value directly injected inline of whatever context the content existed as an entry within.  
+During serialization any untyped Code AST has its string value directly injected inline of whatever context the content existed as an entry within.
 Even though these are not validated from somewhat correct c/c++ syntax or components, it doesn't mean that Untyped code can be added as any component of a Code AST:
 
 * Untyped code cannot have children, thus there cannot be recursive injection this way.
@@ -373,6 +300,7 @@ Code <name> = untyped_str( code(
 ```
 
 Optionally, `code_str`, and `code_fmt` macros can be used so that the code macro doesn't have to be used:
+
 ```cpp
 Code <name> = code_str( <some code without "" quotes > )
 ```
@@ -380,7 +308,7 @@ Code <name> = code_str( <some code without "" quotes > )
 Template metaprogramming in the traditional sense becomes possible with the use of `token_fmt` and parse constructors:
 
 ```cpp
-StrC value = txt("Something");
+Str value = txt("Something");
 
 char const* template_str = txt(
     Code with <key> to replace with token_values
@@ -402,8 +330,8 @@ The following are provided predefined by the library as they are commonly used:
 * `module_global_fragment`
 * `module_private_fragment`
 * `fmt_newline`
-* `param_varaidc` (Used for varadic definitions)
 * `pragma_once`
+* `param_varaidc` (Used for varadic definitions)
 * `preprocess_else`
 * `preprocess_endif`
 * `spec_const`
@@ -419,6 +347,7 @@ The following are provided predefined by the library as they are commonly used:
 * `spec_local_persist` (local_persist macro)
 * `spec_mutable`
 * `spec_neverinline`
+* `spec_noexcept`
 * `spec_override`
 * `spec_ptr`
 * `spec_pure`
@@ -450,8 +379,8 @@ Optionally the following may be defined if `GEN_DEFINE_LIBRARY_CODE_CONSTANTS` i
 * `t_u16`
 * `t_u32`
 * `t_u64`
-* `t_sw` (ssize_t)
-* `t_uw` (size_t)
+* `t_ssize` (ssize_t)
+* `t_usize` (size_t)
 * `t_f32`
 * `t_f64`
 
@@ -469,15 +398,12 @@ and have the desired specifiers assigned to them beforehand.
 
 ## Code generation and modification
 
-There are three provided auxillary interfaces:
+There are two provided auxillary interfaces:
 
 * Builder
-* Editor
 * Scanner
 
-Editor and Scanner are disabled by default, use `GEN_FEATURE_EDITOR` and `GEN_FEATURE_SCANNER` to enable them.
-
-### Builder is a similar object to the jai language's string_builder
+### Builder is a similar object to the jai language's strbuilder_builder
 
 * The purpose of it is to generate a file.
 * A file is specified and opened for writing using the open( file_path) function.
@@ -486,4 +412,8 @@ Editor and Scanner are disabled by default, use `GEN_FEATURE_EDITOR` and `GEN_FE
 
 ### Scanner Auxillary Interface
 
-Provides *(eventually)* `scan_file` to automatically populate a CodeFile which contains a parsed AST (`Code`) of the file, with any contextual failures that are reported from the parser.
+* The purpose is to scan or parse files
+* Some with two basic functions to convert a fil to code: `scan_file` and `parse_file`
+  * `scan_file`: Merely grabs the file and stores it in an untyped Code.
+  * `parse_file`: Will parse the file using `parse_global_body` and return a `CodeBody`.
+* Two basic functions for grabbing columns from a CSV: `parse_csv_one_column` and `parse_csv_two_columns`
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/gen.builder.cpp b/Project/Source/GasaEditor/GasaGen/gencpp/gen.builder.cpp
index 8e1d35e..1cdcac5 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/gen.builder.cpp
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/gen.builder.cpp
@@ -9,6 +9,9 @@
 #   pragma clang diagnostic ignored "-Wunknown-pragmas"
 #	pragma clang diagnostic ignored "-Wvarargs"
 #	pragma clang diagnostic ignored "-Wunused-function"
+#	pragma clang diagnostic ignored "-Wbraced-scalar-init"
+#   pragma clang diagnostic ignored "-W#pragma-messages"
+#	pragma clang diagnostic ignored "-Wstatic-in-inline"
 #endif
 
 #ifdef __GNUC__
@@ -23,7 +26,9 @@
 
 GEN_NS_BEGIN
 
-Builder Builder::open( char const* path )
+#pragma region Builder
+
+Builder builder_open( char const* path )
 {
 	Builder result;
 
@@ -34,51 +39,49 @@ Builder Builder::open( char const* path )
 		return result;
 	}
 
-	result.Buffer = String::make_reserve( GlobalAllocator, Builder_StrBufferReserve );
+	result.Buffer = strbuilder_make_reserve( _ctx->Allocator_Temp, _ctx->InitSize_BuilderBuffer );
 
 	// log_fmt("$Builder - Opened file: %s\n", result.File.filename );
 	return result;
 }
 
-void Builder::pad_lines( s32 num )
+void builder_pad_lines( Builder* builder, s32 num )
 {
-	Buffer.append( "\n" );
+	strbuilder_append_str( & builder->Buffer, txt("\n") );
 }
 
-void Builder::print( Code code )
+void builder_print( Builder* builder, Code code )
 {
-	String   str = code->to_string();
+	StrBuilder   str = code_to_strbuilder(code);
 	// const ssize len = str.length();
 	// log_fmt( "%s - print: %.*s\n", File.filename, len > 80 ? 80 : len, str.Data );
-	Buffer.append( str );
+	strbuilder_append_string( & builder->Buffer, str );
 }
 
-void Builder::print_fmt( char const* fmt, ... )
+void builder_print_fmt_va( Builder* builder, char const* fmt, va_list va )
 {
 	ssize   res;
 	char buf[ GEN_PRINTF_MAXLEN ] = { 0 };
 
-	va_list va;
-	va_start( va, fmt );
-	res = str_fmt_va( buf, count_of( buf ) - 1, fmt, va ) - 1;
-	va_end( va );
+	res = c_str_fmt_va( buf, count_of( buf ) - 1, fmt, va ) - 1;
 
-	// log_fmt( "$%s - print_fmt: %.*s\n", File.filename, res > 80 ? 80 : res, buf );
-	Buffer.append( buf, res );
+	strbuilder_append_c_str_len( (StrBuilder*) & (builder->Buffer), (char const*)buf, res);
 }
 
-void Builder::write()
+void builder_write(Builder* builder)
 {
-	b32 result = file_write( & File, Buffer, Buffer.length() );
+	b32 result = file_write( & builder->File, builder->Buffer, strbuilder_length(builder->Buffer) );
 
 	if ( result == false )
-		log_failure("gen::File::write - Failed to write to file: %s\n", file_name( & File ) );
+		log_failure("gen::File::write - Failed to write to file: %s\n", file_name( & builder->File ) );
 
-	log_fmt( "Generated: %s\n", File.filename );
-	file_close( & File );
-	Buffer.free();
+	log_fmt( "Generated: %s\n", builder->File.filename );
+	file_close( & builder->File );
+	strbuilder_free(& builder->Buffer);
 }
 
+#pragma endregion Builder
+
 GEN_NS_END
 
 #ifdef __clang__
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/gen.builder.hpp b/Project/Source/GasaEditor/GasaGen/gencpp/gen.builder.hpp
index 66f5f01..60d8a08 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/gen.builder.hpp
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/gen.builder.hpp
@@ -9,6 +9,9 @@
 #   pragma clang diagnostic ignored "-Wunknown-pragmas"
 #	pragma clang diagnostic ignored "-Wvarargs"
 #	pragma clang diagnostic ignored "-Wunused-function"
+#	pragma clang diagnostic ignored "-Wbraced-scalar-init"
+#   pragma clang diagnostic ignored "-W#pragma-messages"
+#	pragma clang diagnostic ignored "-Wstatic-in-inline"
 #endif
 
 #ifdef __GNUC__
@@ -25,21 +28,59 @@
 
 GEN_NS_BEGIN
 
+#pragma region Builder
+
+struct Builder;
+typedef struct Builder Builder;
+
+Builder builder_open        ( char const* path );
+void    builder_pad_lines   ( Builder* builder, s32 num );
+void    builder_print       ( Builder* builder, Code code );
+void    builder_print_fmt_va( Builder* builder, char const* fmt, va_list va );
+void    builder_print_fmt   ( Builder* builder, char const* fmt, ... ) {
+	va_list va;
+	va_start( va, fmt );
+	builder_print_fmt_va( builder, fmt, va );
+	va_end( va );
+}
+void builder_write( Builder* builder );
+
 struct Builder
 {
 	FileInfo File;
-	String   Buffer;
+	StrBuilder   Buffer;
 
-	static Builder open( char const* path );
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+	FORCEINLINE static Builder open( char const* path ) { return builder_open(path); }
 
-	void pad_lines( s32 num );
+	FORCEINLINE void pad_lines( s32 num ) { return builder_pad_lines(this, num); }
 
-	void print( Code );
-	void print_fmt( char const* fmt, ... );
+	FORCEINLINE void print( Code code )                { return builder_print(this, code); }
+	FORCEINLINE void print_fmt( char const* fmt, ... ) {
+		va_list va;
+		va_start( va, fmt );
+		builder_print_fmt_va( this, fmt, va );
+		va_end( va );
+	}
 
-	void write();
+	FORCEINLINE void write() { return builder_write(this); }
+#endif
 };
 
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+void    builder_pad_lines( Builder& builder, s32 num )    { return builder_pad_lines(& builder, num); }
+void    builder_print    ( Builder& builder, Code code )  { return builder_print(& builder, code); }
+void    builder_write    ( Builder& builder )             { return builder_write(& builder ); }
+void    builder_print_fmt( Builder& builder, char const* fmt, ...) {
+	va_list va;
+	va_start( va, fmt );
+	builder_print_fmt_va( & builder, fmt, va );
+	va_end( va );
+}
+#endif
+
+#pragma endregion Builder
+
 GEN_NS_END
 
 #ifdef __clang__
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/gen.cpp b/Project/Source/GasaEditor/GasaGen/gencpp/gen.cpp
index 666f214..b5e9341 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/gen.cpp
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/gen.cpp
@@ -9,6 +9,9 @@
 #   pragma clang diagnostic ignored "-Wunknown-pragmas"
 #	pragma clang diagnostic ignored "-Wvarargs"
 #	pragma clang diagnostic ignored "-Wunused-function"
+#	pragma clang diagnostic ignored "-Wbraced-scalar-init"
+#   pragma clang diagnostic ignored "-W#pragma-messages"
+#	pragma clang diagnostic ignored "-Wstatic-in-inline"
 #endif
 
 #ifdef __GNUC__
@@ -28,29 +31,15 @@
 GEN_NS_BEGIN
 
 #pragma region StaticData
-
-// TODO : Convert global allocation strategy to use a slab allocation strategy.
-global AllocatorInfo  GlobalAllocator;
-global Array<Arena>   Global_AllocatorBuckets;
-
-// TODO(Ed) : Make the code pool a dynamic arena
-global Array< Pool >  CodePools         = { nullptr };
-global Array< Arena > StringArenas      = { nullptr };
-
-global StringTable StringCache;
-
-global Arena LexArena;
-
-global AllocatorInfo Allocator_DataArrays  = heap();
-global AllocatorInfo Allocator_CodePool    = heap();
-global AllocatorInfo Allocator_Lexer       = heap();
-global AllocatorInfo Allocator_StringArena = heap();
-global AllocatorInfo Allocator_StringTable = heap();
-global AllocatorInfo Allocator_TypeTable   = heap();
-
-#pragma endregion StaticData
+global Context* _ctx;
 
 #pragma region Constants
+global u32 context_counter;
+
+global Macro enum_underlying_macro;
+
+global Code Code_Global;
+global Code Code_Invalid;
 
 global Code access_public;
 global Code access_protected;
@@ -64,7 +53,7 @@ global Code module_private_fragment;
 
 global Code fmt_newline;
 
-global CodeParam param_varadic;
+global CodeParams param_varadic;
 
 global CodePragma pragma_once;
 
@@ -96,709 +85,724 @@ global CodeSpecifiers spec_thread_local;
 global CodeSpecifiers spec_virtual;
 global CodeSpecifiers spec_volatile;
 
-global CodeType t_empty;
-global CodeType t_auto;
-global CodeType t_void;
-global CodeType t_int;
-global CodeType t_bool;
-global CodeType t_char;
-global CodeType t_wchar_t;
-global CodeType t_class;
-global CodeType t_typename;
-
-global Array< StringCached > PreprocessorDefines;
+global CodeTypename t_empty;
+global CodeTypename t_auto;
+global CodeTypename t_void;
+global CodeTypename t_int;
+global CodeTypename t_bool;
+global CodeTypename t_char;
+global CodeTypename t_wchar_t;
+global CodeTypename t_class;
+global CodeTypename t_typename;
 
 #ifdef GEN_DEFINE_LIBRARY_CODE_CONSTANTS
-global CodeType t_b32;
+global CodeTypename t_b32;
 
-global CodeType t_s8;
-global CodeType t_s16;
-global CodeType t_s32;
-global CodeType t_s64;
+global CodeTypename t_s8;
+global CodeTypename t_s16;
+global CodeTypename t_s32;
+global CodeTypename t_s64;
 
-global CodeType t_u8;
-global CodeType t_u16;
-global CodeType t_u32;
-global CodeType t_u64;
+global CodeTypename t_u8;
+global CodeTypename t_u16;
+global CodeTypename t_u32;
+global CodeTypename t_u64;
 
-global CodeType t_ssize;
-global CodeType t_usize;
+global CodeTypename t_ssize;
+global CodeTypename t_usize;
 
-global CodeType t_f32;
-global CodeType t_f64;
+global CodeTypename t_f32;
+global CodeTypename t_f64;
 #endif
 
 #pragma endregion Constants
 
+#pragma endregion StaticData
+
 #pragma region AST
 
-#	define GEN_AST_BODY_CLASS_UNALLOWED_TYPES \
-	case PlatformAttributes:                  \
-	case Class_Body:                          \
-	case Enum_Body:                           \
-	case Extern_Linkage:                      \
-	case Function_Body:                       \
-	case Function_Fwd:                        \
-	case Global_Body:                         \
-	case Namespace:                           \
-	case Namespace_Body:                      \
-	case Operator:                            \
-	case Operator_Fwd:                        \
-	case Parameters:                          \
-	case Specifiers:                          \
-	case Struct_Body:                         \
-	case Typename:
-#	define GEN_AST_BODY_STRUCT_UNALLOWED_TYPES GEN_AST_BODY_CLASS_UNALLOWED_TYPES
+// These macros are used in the swtich cases within ast.cpp, inteface.upfront.cpp, parser.cpp
 
-#	define GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES \
-	case Access_Public:                          \
-	case Access_Protected:                       \
-	case Access_Private:                         \
-	case PlatformAttributes:                     \
-	case Class_Body:                             \
-	case Enum_Body:                              \
-	case Extern_Linkage:                         \
-	case Friend:                                 \
-	case Function_Body:                          \
-	case Function_Fwd:                           \
-	case Global_Body:                            \
-	case Namespace:                              \
-	case Namespace_Body:                         \
-	case Operator:                               \
-	case Operator_Fwd:                           \
-	case Operator_Member:                        \
-	case Operator_Member_Fwd:                    \
-	case Parameters:                             \
-	case Specifiers:                             \
-	case Struct_Body:                            \
-	case Typename:
+#	define GEN_AST_BODY_CLASS_UNALLOWED_TYPES_CASES    \
+	case CT_PlatformAttributes:                  \
+	case CT_Class_Body:                          \
+	case CT_Enum_Body:                           \
+	case CT_Extern_Linkage:                      \
+	case CT_Function_Body:                       \
+	case CT_Function_Fwd:                        \
+	case CT_Global_Body:                         \
+	case CT_Namespace:                           \
+	case CT_Namespace_Body:                      \
+	case CT_Operator:                            \
+	case CT_Operator_Fwd:                        \
+	case CT_Parameters:                          \
+	case CT_Specifiers:                          \
+	case CT_Struct_Body:                         \
+	case CT_Typename
+#	define GEN_AST_BODY_STRUCT_UNALLOWED_TYPES_CASES GEN_AST_BODY_CLASS_UNALLOWED_TYPES_CASES
 
-#	define GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES \
-	case Access_Public: 				       \
-	case Access_Protected: 				       \
-	case Access_Private: 				       \
-	case PlatformAttributes:                   \
-	case Class_Body: 					       \
-	case Enum_Body: 					       \
-	case Execution: 					       \
-	case Friend: 						       \
-	case Function_Body: 				       \
-	case Namespace_Body: 				       \
-	case Operator_Member: 				       \
-	case Operator_Member_Fwd: 			       \
-	case Parameters: 					       \
-	case Specifiers: 					       \
-	case Struct_Body: 					       \
-	case Typename:
-#	define GEN_AST_BODY_EXPORT_UNALLOWED_TYPES         GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES
-#	define GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES
+#	define GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES_CASES \
+	case CT_Access_Public:                          \
+	case CT_Access_Protected:                       \
+	case CT_Access_Private:                         \
+	case CT_PlatformAttributes:                     \
+	case CT_Class_Body:                             \
+	case CT_Enum_Body:                              \
+	case CT_Extern_Linkage:                         \
+	case CT_Friend:                                 \
+	case CT_Function_Body:                          \
+	case CT_Function_Fwd:                           \
+	case CT_Global_Body:                            \
+	case CT_Namespace:                              \
+	case CT_Namespace_Body:                         \
+	case CT_Operator:                               \
+	case CT_Operator_Fwd:                           \
+	case CT_Operator_Member:                        \
+	case CT_Operator_Member_Fwd:                    \
+	case CT_Parameters:                             \
+	case CT_Specifiers:                             \
+	case CT_Struct_Body:                            \
+	case CT_Typename
 
-#	define GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES \
-	case Access_Public: 				          \
-	case Access_Protected: 				          \
-	case Access_Private: 				          \
-	case PlatformAttributes:                      \
-	case Class_Body: 					          \
-	case Enum_Body: 					          \
-	case Execution: 					          \
-	case Friend: 						          \
-	case Function_Body: 				          \
-	case Namespace_Body: 				          \
-	case Operator_Member: 				          \
-	case Operator_Member_Fwd: 			          \
-	case Parameters: 					          \
-	case Specifiers: 					          \
-	case Struct_Body: 					          \
-	case Typename:
+#	define GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES_CASES     \
+	case CT_Access_Public:                         \
+	case CT_Access_Protected:                      \
+	case CT_Access_Private:                        \
+	case CT_PlatformAttributes:                    \
+	case CT_Class_Body:                            \
+	case CT_Enum_Body:                             \
+	case CT_Execution:                             \
+	case CT_Friend:                                \
+	case CT_Function_Body:                         \
+	case CT_Namespace_Body:                        \
+	case CT_Operator_Member:                       \
+	case CT_Operator_Member_Fwd:                   \
+	case CT_Parameters:                            \
+	case CT_Specifiers:                            \
+	case CT_Struct_Body:                           \
+	case CT_Typename
+#	define GEN_AST_BODY_EXPORT_UNALLOWED_TYPES_CASES         GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES_CASES
+#	define GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES_CASES GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES_CASES
 
-Code Code::Global;
-Code Code::Invalid;
+#	define GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES_CASES \
+	case CT_Access_Public:                        \
+	case CT_Access_Protected:                     \
+	case CT_Access_Private:                       \
+	case CT_PlatformAttributes:                   \
+	case CT_Class_Body:                           \
+	case CT_Enum_Body:                            \
+	case CT_Execution:                            \
+	case CT_Friend:                               \
+	case CT_Function_Body:                        \
+	case CT_Namespace_Body:                       \
+	case CT_Operator_Member:                      \
+	case CT_Operator_Member_Fwd:                  \
+	case CT_Parameters:                           \
+	case CT_Specifiers:                           \
+	case CT_Struct_Body:                          \
+	case CT_Typename
 
 // This serializes all the data-members in a "debug" format, where each member is printed with its associated value.
-char const* AST::debug_str()
+Str code_debug_str(Code self)
 {
-	String result = String::make_reserve( GlobalAllocator, kilobytes(1) );
+	GEN_ASSERT(self != nullptr);
+	StrBuilder  result_stack = strbuilder_make_reserve( _ctx->Allocator_Temp, kilobytes(1) );
+	StrBuilder* result       = & result_stack;
 
-	if ( Parent )
-		result.append_fmt( "\n\tParent       : %S %S", Parent->type_str(), Name ? Name : "" );
+	if ( self->Parent )
+		strbuilder_append_fmt( result, "\n\tParent       : %S %S", code_type_str(self->Parent), self->Name.Len ? self->Name : txt("Null") );
 	else
-		result.append_fmt( "\n\tParent       : %S", "Null" );
+		strbuilder_append_fmt( result, "\n\tParent       : %S", txt("Null") );
 
-	result.append_fmt( "\n\tName         : %S", Name ? Name : "Null" );
-	result.append_fmt( "\n\tType         : %S", type_str() );
-	result.append_fmt( "\n\tModule Flags : %S", to_str( ModuleFlags ) );
+	strbuilder_append_fmt( result, "\n\tName         : %S", self->Name.Len ? self->Name : txt("Null") );
+	strbuilder_append_fmt( result, "\n\tType         : %S", code_type_str(self) );
+	strbuilder_append_fmt( result, "\n\tModule Flags : %S", module_flag_to_str( self->ModuleFlags ) );
 
-	switch ( Type )
+	switch ( self->Type )
 	{
-		using namespace ECode;
-
-		case Invalid:
-		case NewLine:
-		case Access_Private:
-		case Access_Protected:
-		case Access_Public:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Invalid:
+		case CT_NewLine:
+		case CT_Access_Private:
+		case CT_Access_Protected:
+		case CT_Access_Public:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 		break;
 
-		case Untyped:
-		case Execution:
-		case Comment:
-		case PlatformAttributes:
-		case Preprocess_Define:
-		case Preprocess_Include:
-		case Preprocess_Pragma:
-		case Preprocess_If:
-		case Preprocess_ElIf:
-		case Preprocess_Else:
-		case Preprocess_IfDef:
-		case Preprocess_IfNotDef:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Untyped:
+		case CT_Execution:
+		case CT_Comment:
+		case CT_PlatformAttributes:
+		case CT_Preprocess_Include:
+		case CT_Preprocess_Pragma:
+		case CT_Preprocess_If:
+		case CT_Preprocess_ElIf:
+		case CT_Preprocess_Else:
+		case CT_Preprocess_IfDef:
+		case CT_Preprocess_IfNotDef:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tContent: %S", Content );
+			strbuilder_append_fmt( result, "\n\tContent: %S", self->Content );
 		break;
 
-		case Class:
-		case Struct:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-
-			result.append_fmt( "\n\tInlineCmd   : %S", InlineCmt  ? InlineCmt->Content      : "Null" );
-			result.append_fmt( "\n\tAttributes  : %S", Attributes ? Attributes->to_string() : "Null" );
-			result.append_fmt( "\n\tParentAccess: %s", ParentType ? to_str( ParentAccess )  : "No Parent" );
-			result.append_fmt( "\n\tParentType  : %s", ParentType ? ParentType->type_str()  : "Null" );
-			result.append_fmt( "\n\tBody        : %S", Body       ? Body->debug_str()       : "Null" );
+		case CT_Preprocess_Define:
+			// TODO(ED): Needs implementaton
+			log_failure("code_debug_str: NOT IMPLEMENTED for CT_Preprocess_Define");
 		break;
 
-		case Class_Fwd:
-		case Struct_Fwd:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Class:
+		case CT_Struct:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmd   : %S", InlineCmt  ? InlineCmt->Content      : "Null" );
-			result.append_fmt( "\n\tAttributes  : %S", Attributes ? Attributes->to_string() : "Null" );
-			result.append_fmt( "\n\tParentAccess: %s", ParentType ? to_str( ParentAccess )  : "No Parent" );
-			result.append_fmt( "\n\tParentType  : %s", ParentType ? ParentType->type_str()  : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt   : %S", self->InlineCmt  ? self->InlineCmt->Content                                  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tAttributes  : %S", self->Attributes ? strbuilder_to_str( code_to_strbuilder(self->Attributes) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tParentAccess: %S", self->ParentType ? access_spec_to_str( self->ParentAccess )                  : txt("No Parent") );
+			strbuilder_append_fmt( result, "\n\tParentType  : %S", self->ParentType ? code_type_str(self->ParentType)                           : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tBody        : %S", self->Body       ? code_debug_str(self->Body)                                : txt("Null") );
 		break;
 
-		case Constructor:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Class_Fwd:
+		case CT_Struct_Fwd:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt      : %S", InlineCmt       ? InlineCmt->Content           : "Null" );
-			result.append_fmt( "\n\tSpecs          : %S", Specs           ? Specs->to_string()           : "Null" );
-			result.append_fmt( "\n\tInitializerList: %S", InitializerList ? InitializerList->to_string() : "Null" );
-			result.append_fmt( "\n\tParams         : %S", Params          ? Params->to_string()          : "Null" );
-			result.append_fmt( "\n\tBody           : %S", Body            ? Body->debug_str()            : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt   : %S", self->InlineCmt  ? self->InlineCmt->Content                                  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tAttributes  : %S", self->Attributes ? strbuilder_to_str( code_to_strbuilder(self->Attributes) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tParentAccess: %S", self->ParentType ? access_spec_to_str( self->ParentAccess )                  : txt("No Parent") );
+			strbuilder_append_fmt( result, "\n\tParentType  : %S", self->ParentType ? code_type_str(self->ParentType)                           : txt("Null") );
 		break;
 
-		case Constructor_Fwd:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Constructor:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt      : %S", InlineCmt       ? InlineCmt->Content           : "Null" );
-			result.append_fmt( "\n\tSpecs          : %S", Specs           ? Specs->to_string()           : "Null" );
-			result.append_fmt( "\n\tInitializerList: %S", InitializerList ? InitializerList->to_string() : "Null" );
-			result.append_fmt( "\n\tParams         : %S", Params          ? Params->to_string()          : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt      : %S", self->InlineCmt       ? self->InlineCmt->Content                                       : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tSpecs          : %S", self->Specs           ? strbuilder_to_str( code_to_strbuilder(self->Specs) )           : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tInitializerList: %S", self->InitializerList ? strbuilder_to_str( code_to_strbuilder(self->InitializerList) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tParams         : %S", self->Params          ? strbuilder_to_str( code_to_strbuilder(self->Params) )          : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tBody           : %S", self->Body            ? code_debug_str(self->Body)                                     : txt("Null") );
 		break;
 
-		case Destructor:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Constructor_Fwd:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt      : %S", InlineCmt ? InlineCmt->Content : "Null" );
-			result.append_fmt( "\n\tSpecs          : %S", Specs     ? Specs->to_string() : "Null" );
-			result.append_fmt( "\n\tBody           : %S", Body      ? Body->debug_str()  : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt      : %S", self->InlineCmt       ? self->InlineCmt->Content                                       : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tSpecs          : %S", self->Specs           ? strbuilder_to_str( code_to_strbuilder(self->Specs) )           : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tInitializerList: %S", self->InitializerList ? strbuilder_to_str( code_to_strbuilder(self->InitializerList) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tParams         : %S", self->Params          ? strbuilder_to_str( code_to_strbuilder(self->Params) )          : txt("Null") );
 		break;
 
-		case Destructor_Fwd:
+		case CT_Destructor:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+
+			strbuilder_append_fmt( result, "\n\tInlineCmt      : %S", self->InlineCmt       ? self->InlineCmt->Content                             : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tSpecs          : %S", self->Specs           ? strbuilder_to_str( code_to_strbuilder(self->Specs) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tBody           : %S", self->Body            ? code_debug_str(self->Body)                           : txt("Null") );
 		break;
 
-		case Enum:
-		case Enum_Class:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-
-			result.append_fmt( "\n\tInlineCmt       : %S", InlineCmt      ? InlineCmt->Content          : "Null" );
-			result.append_fmt( "\n\tAttributes      : %S", Attributes     ? Attributes->to_string()     : "Null" );
-			result.append_fmt( "\n\tUnderlying Type : %S", UnderlyingType ? UnderlyingType->to_string() : "Null" );
-			result.append_fmt( "\n\tBody            : %S", Body           ? Body->debug_str()           : "Null" );
+		case CT_Destructor_Fwd:
 		break;
 
-		case Enum_Fwd:
-		case Enum_Class_Fwd:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Enum:
+		case CT_Enum_Class:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt       : %S", InlineCmt      ? InlineCmt->Content          : "Null" );
-			result.append_fmt( "\n\tAttributes      : %S", Attributes     ? Attributes->to_string()     : "Null" );
-			result.append_fmt( "\n\tUnderlying Type : %S", UnderlyingType ? UnderlyingType->to_string() : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt       : %S", self->InlineCmt      ? self->InlineCmt->Content                                     : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tAttributes      : %S", self->Attributes     ? strbuilder_to_str( code_to_strbuilder(self->Attributes) )    : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tUnderlying Type : %S", self->UnderlyingType ? strbuilder_to_str( code_to_strbuilder(self->UnderlyingType)) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tBody            : %S", self->Body           ? code_debug_str(self->Body)                                   : txt("Null") );
 		break;
 
-		case Extern_Linkage:
-		case Namespace:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Enum_Fwd:
+		case CT_Enum_Class_Fwd:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tBody: %S", Body ? Body->debug_str() : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt       : %S", self->InlineCmt      ? self->InlineCmt->Content                                     : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tAttributes      : %S", self->Attributes     ? strbuilder_to_str( code_to_strbuilder(self->Attributes) )    : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tUnderlying Type : %S", self->UnderlyingType ? strbuilder_to_str( code_to_strbuilder(self->UnderlyingType)) : txt("Null") );
 		break;
 
-		case Friend:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Extern_Linkage:
+		case CT_Namespace:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt  : %S", InlineCmt   ? InlineCmt->Content       : "Null" );
-			result.append_fmt( "\n\tDeclaration: %S", Declaration ? Declaration->to_string() : "Null" );
+			strbuilder_append_fmt( result, "\n\tBody: %S", self->Body ? code_debug_str(self->Body) : txt("Null") );
 		break;
 
-		case Function:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Friend:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt : %S", InlineCmt  ? InlineCmt->Content      : "Null" );
-			result.append_fmt( "\n\tAttributes: %S", Attributes ? Attributes->to_string() : "Null" );
-			result.append_fmt( "\n\tSpecs     : %S", Specs      ? Specs->to_string()      : "Null" );
-			result.append_fmt( "\n\tReturnType: %S", ReturnType ? ReturnType->to_string() : "Null" );
-			result.append_fmt( "\n\tParams    : %S", Params     ? Params->to_string()     : "Null" );
-			result.append_fmt( "\n\tBody      : %S", Body       ? Body->debug_str()       : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt  : %S", self->InlineCmt   ? self->InlineCmt->Content                                  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tDeclaration: %S", self->Declaration ? strbuilder_to_str( code_to_strbuilder(self->Declaration)) : txt("Null") );
 		break;
 
-		case Function_Fwd:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Function:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt : %S", InlineCmt  ? InlineCmt->Content      : "Null" );
-			result.append_fmt( "\n\tAttributes: %S", Attributes ? Attributes->to_string() : "Null" );
-			result.append_fmt( "\n\tSpecs     : %S", Specs      ? Specs->to_string()      : "Null" );
-			result.append_fmt( "\n\tReturnType: %S", ReturnType ? ReturnType->to_string() : "Null" );
-			result.append_fmt( "\n\tParams    : %S", Params     ? Params->to_string()     : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt : %S", self->InlineCmt  ? self->InlineCmt->Content                                  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tAttributes: %S", self->Attributes ? strbuilder_to_str( code_to_strbuilder(self->Attributes) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tSpecs     : %S", self->Specs      ? strbuilder_to_str( code_to_strbuilder(self->Specs))       : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tReturnType: %S", self->ReturnType ? strbuilder_to_str( code_to_strbuilder(self->ReturnType))  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tParams    : %S", self->Params     ? strbuilder_to_str( code_to_strbuilder(self->Params))      : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tBody      : %S", self->Body       ? code_debug_str(self->Body)                                : txt("Null") );
 		break;
 
-		case Module:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Function_Fwd:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+
+			strbuilder_append_fmt( result, "\n\tInlineCmt : %S", self->InlineCmt  ? self->InlineCmt->Content                                  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tAttributes: %S", self->Attributes ? strbuilder_to_str( code_to_strbuilder(self->Attributes) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tSpecs     : %S", self->Specs      ? strbuilder_to_str( code_to_strbuilder(self->Specs))       : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tReturnType: %S", self->ReturnType ? strbuilder_to_str( code_to_strbuilder(self->ReturnType))  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tParams    : %S", self->Params     ? strbuilder_to_str( code_to_strbuilder(self->Params))      : txt("Null") );
 		break;
 
-		case Operator:
-		case Operator_Member:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-
-			result.append_fmt( "\n\tInlineCmt : %S", InlineCmt  ? InlineCmt->Content      : "Null" );
-			result.append_fmt( "\n\tAttributes: %S", Attributes ? Attributes->to_string() : "Null" );
-			result.append_fmt( "\n\tSpecs     : %S", Specs      ? Specs->to_string()      : "Null" );
-			result.append_fmt( "\n\tReturnType: %S", ReturnType ? ReturnType->to_string() : "Null" );
-			result.append_fmt( "\n\tParams    : %S", Params     ? Params->to_string()     : "Null" );
-			result.append_fmt( "\n\tBody      : %S", Body       ? Body->debug_str()       : "Null" );
-			result.append_fmt( "\n\tOp        : %S", to_str( Op ) );
+		case CT_Module:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 		break;
 
-		case Operator_Fwd:
-		case Operator_Member_Fwd:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Operator:
+		case CT_Operator_Member:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt : %S", InlineCmt  ? InlineCmt->Content      : "Null" );
-			result.append_fmt( "\n\tAttributes: %S", Attributes ? Attributes->to_string() : "Null" );
-			result.append_fmt( "\n\tSpecs     : %S", Specs      ? Specs->to_string()      : "Null" );
-			result.append_fmt( "\n\tReturnType: %S", ReturnType ? ReturnType->to_string() : "Null" );
-			result.append_fmt( "\n\tParams    : %S", Params     ? Params->to_string()     : "Null" );
-			result.append_fmt( "\n\tOp        : %S", to_str( Op ) );
+			strbuilder_append_fmt( result, "\n\tInlineCmt : %S", self->InlineCmt  ? self->InlineCmt->Content                                  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tAttributes: %S", self->Attributes ? strbuilder_to_str( code_to_strbuilder(self->Attributes) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tSpecs     : %S", self->Specs      ? strbuilder_to_str( code_to_strbuilder(self->Specs))       : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tReturnType: %S", self->ReturnType ? strbuilder_to_str( code_to_strbuilder(self->ReturnType))  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tParams    : %S", self->Params     ? strbuilder_to_str( code_to_strbuilder(self->Params))      : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tBody      : %S", self->Body       ? code_debug_str(self->Body)                                : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tOp        : %S", operator_to_str( self->Op ) );
 		break;
 
-		case Operator_Cast:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Operator_Fwd:
+		case CT_Operator_Member_Fwd:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt : %S", InlineCmt  ? InlineCmt->Content     : "Null" );
-			result.append_fmt( "\n\tSpecs     : %S", Specs      ? Specs->to_string()     : "Null" );
-			result.append_fmt( "\n\tValueType : %S", ValueType  ? ValueType->to_string() : "Null" );
-			result.append_fmt( "\n\tBody      : %S", Body       ? Body->debug_str()      : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt : %S", self->InlineCmt  ? self->InlineCmt->Content                                  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tAttributes: %S", self->Attributes ? strbuilder_to_str( code_to_strbuilder(self->Attributes) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tSpecs     : %S", self->Specs      ? strbuilder_to_str( code_to_strbuilder(self->Specs) )      : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tReturnType: %S", self->ReturnType ? strbuilder_to_str( code_to_strbuilder(self->ReturnType) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tParams    : %S", self->Params     ? strbuilder_to_str( code_to_strbuilder(self->Params) )     : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tOp        : %S", operator_to_str( self->Op ) );
 		break;
 
-		case Operator_Cast_Fwd:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Operator_Cast:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt : %S", InlineCmt  ? InlineCmt->Content     : "Null" );
-			result.append_fmt( "\n\tSpecs     : %S", Specs      ? Specs->to_string()     : "Null" );
-			result.append_fmt( "\n\tValueType : %S", ValueType  ? ValueType->to_string() : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt : %S", self->InlineCmt  ? self->InlineCmt->Content                                : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tSpecs     : %S", self->Specs      ? strbuilder_to_str( code_to_strbuilder(self->Specs))     : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tValueType : %S", self->ValueType  ? strbuilder_to_str( code_to_strbuilder(self->ValueType)) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tBody      : %S", self->Body       ? code_debug_str(self->Body)                              : txt("Null") );
 		break;
 
-		case Parameters:
-			result.append_fmt( "\n\tNumEntries: %d", NumEntries );
-			result.append_fmt( "\n\tLast      : %S", Last->Name );
-			result.append_fmt( "\n\tNext      : %S", Next->Name );
-			result.append_fmt( "\n\tValueType : %S", ValueType ? ValueType->to_string() : "Null" );
-			result.append_fmt( "\n\tValue     : %S", Value     ? Value->to_string()     : "Null" );
+		case CT_Operator_Cast_Fwd:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+
+			strbuilder_append_fmt( result, "\n\tInlineCmt : %S", self->InlineCmt  ? self->InlineCmt->Content                                : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tSpecs     : %S", self->Specs      ? strbuilder_to_str( code_to_strbuilder(self->Specs))     : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tValueType : %S", self->ValueType  ? strbuilder_to_str( code_to_strbuilder(self->ValueType)) : txt("Null") );
 		break;
 
-		case Specifiers:
+		case CT_Parameters:
+			strbuilder_append_fmt( result, "\n\tNumEntries: %d", self->NumEntries );
+			strbuilder_append_fmt( result, "\n\tLast      : %S", self->Last->Name );
+			strbuilder_append_fmt( result, "\n\tNext      : %S", self->Next->Name );
+			strbuilder_append_fmt( result, "\n\tValueType : %S", self->ValueType ? strbuilder_to_str( code_to_strbuilder(self->ValueType)) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tValue     : %S", self->Value     ? strbuilder_to_str( code_to_strbuilder(self->Value))     : txt("Null") );
+		break;
+
+		case CT_Parameters_Define:
+			// TODO(ED): Needs implementaton
+			log_failure("code_debug_str: NOT IMPLEMENTED for CT_Parameters_Define");
+		break;
+
+		case CT_Specifiers:
 		{
-			result.append_fmt( "\n\tNumEntries: %d", NumEntries );
-			result.append( "\n\tArrSpecs: " );
+			strbuilder_append_fmt( result, "\n\tNumEntries: %d", self->NumEntries );
+			strbuilder_append_str( result, txt("\n\tArrSpecs: ") );
 
 			s32 idx  = 0;
-			s32 left = NumEntries;
+			s32 left = self->NumEntries;
 			while ( left-- )
 			{
-				StrC spec = ESpecifier::to_str( ArrSpecs[idx] );
-				result.append_fmt( "%.*s, ", spec.Len, spec.Ptr );
+				Str spec = spec_to_str( self->ArrSpecs[idx] );
+				strbuilder_append_fmt( result, "%.*s, ", spec.Len, spec.Ptr );
 				idx++;
 			}
-			result.append_fmt( "\n\tNextSpecs: %S", NextSpecs ? NextSpecs->debug_str() : "Null" );
+			strbuilder_append_fmt( result, "\n\tNextSpecs: %S", self->NextSpecs ? code_debug_str(self->NextSpecs) : txt("Null") );
 		}
 		break;
 
-		case Template:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Template:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tParams     : %S", Params      ? Params->to_string()      : "Null" );
-			result.append_fmt( "\n\tDeclaration: %S", Declaration ? Declaration->to_string() : "Null" );
+			strbuilder_append_fmt( result, "\n\tParams     : %S", self->Params      ? strbuilder_to_str( code_to_strbuilder(self->Params))      : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tDeclaration: %S", self->Declaration ? strbuilder_to_str( code_to_strbuilder(self->Declaration)) : txt("Null") );
 		break;
 
-		case Typedef:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Typedef:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt     : %S", InlineCmt      ? InlineCmt->Content          : "Null" );
-			result.append_fmt( "\n\tUnderlyingType: %S", UnderlyingType ? UnderlyingType->to_string() : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt     : %S", self->InlineCmt      ? self->InlineCmt->Content                                     : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tUnderlyingType: %S", self->UnderlyingType ? strbuilder_to_str( code_to_strbuilder(self->UnderlyingType)) : txt("Null") );
 		break;
 
-		case Typename:
-			result.append_fmt( "\n\tAttributes     : %S", Attributes ? Attributes->to_string() : "Null" );
-			result.append_fmt( "\n\tSpecs          : %S", Specs      ? Specs->to_string()      : "Null" );
-			result.append_fmt( "\n\tReturnType     : %S", ReturnType ? ReturnType->to_string() : "Null" );
-			result.append_fmt( "\n\tParams         : %S", Params     ? Params->to_string()     : "Null" );
-			result.append_fmt( "\n\tArrExpr        : %S", ArrExpr    ? ArrExpr->to_string()    : "Null" );
+		case CT_Typename:
+			strbuilder_append_fmt( result, "\n\tAttributes     : %S", self->Attributes ? strbuilder_to_str( code_to_strbuilder(self->Attributes) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tSpecs          : %S", self->Specs      ? strbuilder_to_str( code_to_strbuilder(self->Specs))       : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tReturnType     : %S", self->ReturnType ? strbuilder_to_str( code_to_strbuilder(self->ReturnType))  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tParams         : %S", self->Params     ? strbuilder_to_str( code_to_strbuilder(self->Params))      : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tArrExpr        : %S", self->ArrExpr    ? strbuilder_to_str( code_to_strbuilder(self->ArrExpr))     : txt("Null") );
 		break;
 
-		case Union:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Union:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tAttributes: %S", Attributes ? Attributes->to_string() : "Null" );
-			result.append_fmt( "\n\tBody      : %S", Body       ? Body->debug_str()       : "Null" );
+			strbuilder_append_fmt( result, "\n\tAttributes: %S", self->Attributes ? strbuilder_to_str( code_to_strbuilder(self->Attributes) ) : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tBody      : %S", self->Body       ? code_debug_str(self->Body)                                : txt("Null") );
 		break;
 
-		case Using:
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+		case CT_Using:
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt     : %S", InlineCmt      ? InlineCmt->Content          : "Null" );
-			result.append_fmt( "\n\tAttributes    : %S", Attributes     ? Attributes->to_string()     : "Null" );
-			result.append_fmt( "\n\tUnderlyingType: %S", UnderlyingType ? UnderlyingType->to_string() : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt     : %S", self->InlineCmt      ? self->InlineCmt->Content                                      : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tAttributes    : %S", self->Attributes     ? strbuilder_to_str( code_to_strbuilder(self->Attributes) )     : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tUnderlyingType: %S", self->UnderlyingType ? strbuilder_to_str( code_to_strbuilder(self->UnderlyingType))  : txt("Null") );
 		break;
 
-		case Variable:
+		case CT_Variable:
 
-			if ( Parent && Parent->Type == Variable )
+			if ( self->Parent && self->Parent->Type == CT_Variable )
 			{
 				// Its a NextVar
-				result.append_fmt( "\n\tSpecs       : %S", Specs        ? Specs->to_string()        : "Null" );
-				result.append_fmt( "\n\tValue       : %S", Value        ? Value->to_string()        : "Null" );
-				result.append_fmt( "\n\tBitfieldSize: %S", BitfieldSize ? BitfieldSize->to_string() : "Null" );
-				result.append_fmt( "\n\tNextVar     : %S", NextVar      ? NextVar->debug_str()      : "Null" );
+				strbuilder_append_fmt( result, "\n\tSpecs       : %S", self->Specs        ? strbuilder_to_str( code_to_strbuilder(self->Specs))        : txt("Null") );
+				strbuilder_append_fmt( result, "\n\tValue       : %S", self->Value        ? strbuilder_to_str( code_to_strbuilder(self->Value))        : txt("Null") );
+				strbuilder_append_fmt( result, "\n\tBitfieldSize: %S", self->BitfieldSize ? strbuilder_to_str( code_to_strbuilder(self->BitfieldSize)) : txt("Null") );
+				strbuilder_append_fmt( result, "\n\tNextVar     : %S", self->NextVar      ? code_debug_str(self->NextVar)                              : txt("Null") );
 				break;
 			}
 
-			if ( Prev )
-				result.append_fmt( "\n\tPrev: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
-			if ( Next )
-				result.append_fmt( "\n\tNext: %S %S", Prev->type_str(), Prev->Name ? Prev->Name : "Null" );
+			if ( self->Prev )
+				strbuilder_append_fmt( result, "\n\tPrev: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
+			if ( self->Next )
+				strbuilder_append_fmt( result, "\n\tNext: %S %S", code_type_str(self->Prev), self->Prev->Name.Len ? self->Prev->Name : txt("Null") );
 
-			result.append_fmt( "\n\tInlineCmt   : %S", InlineCmt    ? InlineCmt->Content        : "Null" );
-			result.append_fmt( "\n\tAttributes  : %S", Attributes   ? Attributes->to_string()   : "Null" );
-			result.append_fmt( "\n\tSpecs       : %S", Specs        ? Specs->to_string()        : "Null" );
-			result.append_fmt( "\n\tValueType   : %S", ValueType    ? ValueType->to_string()    : "Null" );
-			result.append_fmt( "\n\tBitfieldSize: %S", BitfieldSize ? BitfieldSize->to_string() : "Null" );
-			result.append_fmt( "\n\tValue       : %S", Value        ? Value->to_string()        : "Null" );
-			result.append_fmt( "\n\tNextVar     : %S", NextVar      ? NextVar->debug_str()      : "Null" );
+			strbuilder_append_fmt( result, "\n\tInlineCmt   : %S", self->InlineCmt    ? self->InlineCmt->Content                                    : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tAttributes  : %S", self->Attributes   ? strbuilder_to_str( code_to_strbuilder(self->Attributes) )   : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tSpecs       : %S", self->Specs        ? strbuilder_to_str( code_to_strbuilder(self->Specs))         : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tValueType   : %S", self->ValueType    ? strbuilder_to_str( code_to_strbuilder(self->ValueType))     : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tBitfieldSize: %S", self->BitfieldSize ? strbuilder_to_str( code_to_strbuilder(self->BitfieldSize))  : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tValue       : %S", self->Value        ? strbuilder_to_str( code_to_strbuilder(self->Value))         : txt("Null") );
+			strbuilder_append_fmt( result, "\n\tNextVar     : %S", self->NextVar      ? code_debug_str(self->NextVar)                               : txt("Null") );
 		break;
 	}
 
+	return strbuilder_to_str( * result );
+}
+
+Code code_duplicate(Code self)
+{
+	Code result = make_code();
+
+	void* mem_result = rcast(void*, cast(AST*, result));
+	void* mem_self   = rcast(void*, cast(AST*, self));
+	mem_copy( mem_result, mem_self, sizeof( AST ) );
+
+	result->Parent = NullCode;
 	return result;
 }
 
-AST* AST::duplicate()
+StrBuilder code_to_strbuilder(Code self)
 {
-	using namespace ECode;
-
-	AST* result = make_code().ast;
-
-	mem_copy( result, this, sizeof( AST ) );
-
-	result->Parent = nullptr;
+	StrBuilder result = strbuilder_make_str( _ctx->Allocator_Temp, txt("") );
+	code_to_strbuilder_ptr( self, & result );
 	return result;
 }
 
-String AST::to_string()
-{
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
-	return result;
-}
-
-void AST::to_string( String& result )
+void code_to_strbuilder_ptr( Code self, StrBuilder* result )
 {
+	GEN_ASSERT(self != nullptr);
 	local_persist thread_local
 	char SerializationLevel = 0;
 
-	switch ( Type )
+	switch ( self->Type )
 	{
-		using namespace ECode;
-
-		case Invalid:
+		case CT_Invalid:
 		#ifdef GEN_DONT_ALLOW_INVALID_CODE
-			log_failure("Attempted to serialize invalid code! - %S", Parent ? Parent->debug_str() : Name );
+			log_failure("Attempted to serialize invalid code! - %S", Parent ? Parent->code_debug_str() : Name );
 		#else
-			result.append_fmt( "Invalid Code!" );
+			strbuilder_append_fmt( result, "Invalid Code!" );
 		#endif
 		break;
 
-		case NewLine:
-			result.append("\n");
+		case CT_NewLine:
+			strbuilder_append_str( result, txt("\n"));
 		break;
 
-		case Untyped:
-		case Execution:
-		case Comment:
-		case PlatformAttributes:
-			result.append( Content );
+		case CT_Untyped:
+		case CT_Execution:
+		case CT_Comment:
+		case CT_PlatformAttributes:
+			strbuilder_append_str( result, self->Content );
 		break;
 
-		case Access_Private:
-		case Access_Protected:
-		case Access_Public:
-			result.append( Name );
+		case CT_Access_Private:
+		case CT_Access_Protected:
+		case CT_Access_Public:
+			strbuilder_append_str( result, self->Name );
 		break;
 
-		case Class:
-			cast<CodeClass>().to_string_def( result );
+		case CT_Class:
+			class_to_strbuilder_def(cast(CodeClass, self), result );
 		break;
 
-		case Class_Fwd:
-			cast<CodeClass>().to_string_fwd( result );
+		case CT_Class_Fwd:
+			class_to_strbuilder_fwd(cast(CodeClass, self), result );
 		break;
 
-		case Constructor:
-			cast<CodeConstructor>().to_string_def( result );
+		case CT_Constructor:
+			constructor_to_strbuilder_def(cast(CodeConstructor, self), result );
 		break;
 
-		case Constructor_Fwd:
-			cast<CodeConstructor>().to_string_fwd( result );
+		case CT_Constructor_Fwd:
+			constructor_to_strbuilder_fwd(cast(CodeConstructor, self), result );
 		break;
 
-		case Destructor:
-			cast<CodeDestructor>().to_string_def( result );
+		case CT_Destructor:
+			destructor_to_strbuilder_def(cast(CodeDestructor, self), result );
 		break;
 
-		case Destructor_Fwd:
-			cast<CodeDestructor>().to_string_fwd( result );
+		case CT_Destructor_Fwd:
+			destructor_to_strbuilder_fwd(cast(CodeDestructor, self), result );
 		break;
 
-		case Enum:
-			cast<CodeEnum>().to_string_def( result );
+		case CT_Enum:
+			enum_to_strbuilder_def(cast(CodeEnum, self), result );
 		break;
 
-		case Enum_Fwd:
-			cast<CodeEnum>().to_string_fwd( result );
+		case CT_Enum_Fwd:
+			enum_to_strbuilder_fwd(cast(CodeEnum, self), result );
 		break;
 
-		case Enum_Class:
-			cast<CodeEnum>().to_string_class_def( result );
+		case CT_Enum_Class:
+			enum_to_strbuilder_class_def(cast(CodeEnum, self), result );
 		break;
 
-		case Enum_Class_Fwd:
-			cast<CodeEnum>().to_string_class_fwd( result );
+		case CT_Enum_Class_Fwd:
+			enum_to_strbuilder_class_fwd(cast(CodeEnum, self), result );
 		break;
 
-		case Export_Body:
-			cast<CodeBody>().to_string_export( result );
+		case CT_Export_Body:
+			body_to_strbuilder_export(cast(CodeBody, self), result );
 		break;
 
-		case Extern_Linkage:
-			cast<CodeExtern>().to_string( result );
+		case CT_Extern_Linkage:
+			extern_to_strbuilder(cast(CodeExtern, self), result );
 		break;
 
-		case Friend:
-			cast<CodeFriend>().to_string( result );
+		case CT_Friend:
+			friend_to_strbuilder_ref(cast(CodeFriend, self), result );
 		break;
 
-		case Function:
-			cast<CodeFn>().to_string_def( result );
+		case CT_Function:
+			fn_to_strbuilder_def(cast(CodeFn, self), result );
 		break;
 
-		case Function_Fwd:
-			cast<CodeFn>().to_string_fwd( result );
+		case CT_Function_Fwd:
+			fn_to_strbuilder_fwd(cast(CodeFn, self), result );
 		break;
 
-		case Module:
-			cast<CodeModule>().to_string( result );
+		case CT_Module:
+			module_to_strbuilder_ref(cast(CodeModule, self), result );
 		break;
 
-		case Namespace:
-			cast<CodeNS>().to_string( result );
+		case CT_Namespace:
+			namespace_to_strbuilder_ref(cast(CodeNS, self), result );
 		break;
 
-		case Operator:
-		case Operator_Member:
-			cast<CodeOperator>().to_string_def( result );
+		case CT_Operator:
+		case CT_Operator_Member:
+			code_op_to_strbuilder_def(cast(CodeOperator, self), result );
 		break;
 
-		case Operator_Fwd:
-		case Operator_Member_Fwd:
-			cast<CodeOperator>().to_string_fwd( result );
+		case CT_Operator_Fwd:
+		case CT_Operator_Member_Fwd:
+			code_op_to_strbuilder_fwd(cast(CodeOperator, self), result );
 		break;
 
-		case Operator_Cast:
-			cast<CodeOpCast>().to_string_def( result );
+		case CT_Operator_Cast:
+			opcast_to_strbuilder_def(cast(CodeOpCast, self), result );
 		break;
 
-		case Operator_Cast_Fwd:
-			cast<CodeOpCast>().to_string_fwd( result );
+		case CT_Operator_Cast_Fwd:
+			opcast_to_strbuilder_fwd(cast(CodeOpCast, self), result );
 		break;
 
-		case Parameters:
-			cast<CodeParam>().to_string( result );
+		case CT_Parameters:
+			params_to_strbuilder_ref(cast(CodeParams, self), result );
 		break;
 
-		case Preprocess_Define:
-			cast<CodeDefine>().to_string( result );
+		case CT_Parameters_Define:
+			define_params_to_strbuilder_ref(cast(CodeDefineParams, self), result);
 		break;
 
-		case Preprocess_If:
-			cast<CodePreprocessCond>().to_string_if( result );
+		case CT_Preprocess_Define:
+			define_to_strbuilder_ref(cast(CodeDefine, self), result );
 		break;
 
-		case Preprocess_IfDef:
-			cast<CodePreprocessCond>().to_string_ifdef( result );
+		case CT_Preprocess_If:
+			preprocess_to_strbuilder_if(cast(CodePreprocessCond, self), result );
 		break;
 
-		case Preprocess_IfNotDef:
-			cast<CodePreprocessCond>().to_string_ifndef( result );
+		case CT_Preprocess_IfDef:
+			preprocess_to_strbuilder_ifdef(cast(CodePreprocessCond, self), result );
 		break;
 
-		case Preprocess_Include:
-			cast<CodeInclude>().to_string( result );
+		case CT_Preprocess_IfNotDef:
+			preprocess_to_strbuilder_ifndef(cast(CodePreprocessCond, self), result );
 		break;
 
-		case Preprocess_ElIf:
-			cast<CodePreprocessCond>().to_string_elif( result );
+		case CT_Preprocess_Include:
+			include_to_strbuilder_ref(cast(CodeInclude, self), result );
 		break;
 
-		case Preprocess_Else:
-			cast<CodePreprocessCond>().to_string_else( result );
+		case CT_Preprocess_ElIf:
+			preprocess_to_strbuilder_elif(cast(CodePreprocessCond, self), result );
 		break;
 
-		case Preprocess_EndIf:
-			cast<CodePreprocessCond>().to_string_endif( result );
+		case CT_Preprocess_Else:
+			preprocess_to_strbuilder_else(cast(CodePreprocessCond, self), result );
 		break;
 
-		case Preprocess_Pragma:
-			cast<CodePragma>().to_string( result );
+		case CT_Preprocess_EndIf:
+			preprocess_to_strbuilder_endif(cast(CodePreprocessCond, self), result );
 		break;
 
-		case Specifiers:
-			cast<CodeSpecifiers>().to_string( result );
+		case CT_Preprocess_Pragma:
+			pragma_to_strbuilder_ref(cast(CodePragma, self), result );
 		break;
 
-		case Struct:
-			cast<CodeStruct>().to_string_def( result );
+		case CT_Specifiers:
+			specifiers_to_strbuilder_ref(cast(CodeSpecifiers, self), result );
 		break;
 
-		case Struct_Fwd:
-			cast<CodeStruct>().to_string_fwd( result );
+		case CT_Struct:
+			struct_to_strbuilder_def(cast(CodeStruct, self), result );
 		break;
 
-		case Template:
-			cast<CodeTemplate>().to_string( result );
+		case CT_Struct_Fwd:
+			struct_to_strbuilder_fwd(cast(CodeStruct, self), result );
 		break;
 
-		case Typedef:
-			cast<CodeTypedef>().to_string( result );
+		case CT_Template:
+			template_to_strbuilder_ref(cast(CodeTemplate, self), result );
 		break;
 
-		case Typename:
-			cast<CodeType>().to_string( result );
+		case CT_Typedef:
+			typedef_to_strbuilder_ref(cast(CodeTypedef, self), result );
 		break;
 
-		case Union:
-			cast<CodeUnion>().to_string( result );
+		case CT_Typename:
+			typename_to_strbuilder_ref(cast(CodeTypename, self), result );
 		break;
 
-		case Using:
-			cast<CodeUsing>().to_string( result );
+		case CT_Union:
+			union_to_strbuilder_def( cast(CodeUnion, self), result );
 		break;
 
-		case Using_Namespace:
-			cast<CodeUsing>().to_string_ns( result );
+		case CT_Union_Fwd:
+			union_to_strbuilder_fwd( cast(CodeUnion, self), result );
 		break;
 
-		case Variable:
-			cast<CodeVar>().to_string( result );
+		case CT_Using:
+			using_to_strbuilder_ref(cast(CodeUsing, self), result );
 		break;
 
-		case Enum_Body:
-		case Class_Body:
-		case Extern_Linkage_Body:
-		case Function_Body:
-		case Global_Body:
-		case Namespace_Body:
-		case Struct_Body:
-		case Union_Body:
-			cast<CodeBody>().to_string( result );
+		case CT_Using_Namespace:
+			using_to_strbuilder_ns(cast(CodeUsing, self), result );
+		break;
+
+		case CT_Variable:
+			var_to_strbuilder_ref(cast(CodeVar, self), result );
+		break;
+
+		case CT_Enum_Body:
+		case CT_Class_Body:
+		case CT_Extern_Linkage_Body:
+		case CT_Function_Body:
+		case CT_Global_Body:
+		case CT_Namespace_Body:
+		case CT_Struct_Body:
+		case CT_Union_Body:
+			body_to_strbuilder_ref( cast(CodeBody, self), result );
 		break;
 	}
 }
 
-bool AST::is_equal( AST* other )
+bool code_is_equal( Code self, Code other )
 {
 /*
 	AST values are either some u32 value, a cached string, or a pointer to another AST.
@@ -809,127 +813,124 @@ bool AST::is_equal( AST* other )
 */
 	if ( other == nullptr )
 	{
-		log_fmt( "AST::is_equal: other is null\nAST: %S", debug_str() );
+		log_fmt( "AST::is_equal: other is null\nAST: %S", code_debug_str(self) );
 		return false;
 	}
 
-	if ( Type != other->Type )
+	if ( self->Type != other->Type )
 	{
 		log_fmt("AST::is_equal: Type check failure with other\nAST: %S\nOther: %S"
-			, debug_str()
-			, other->debug_str()
+			, code_debug_str(self)
+			, code_debug_str(other)
 		);
 
 		return false;
 	}
 
-	switch ( Type )
+	switch ( self->Type )
 	{
-		using namespace ECode;
-
 	#define check_member_val( val )                           \
-	if ( val != other->val )                                  \
+	if ( self->val != other->val )                            \
 	{                                                         \
 		log_fmt("\nAST::is_equal: Member - " #val " failed\n" \
 		        "AST  : %S\n"                                 \
 		        "Other: %S\n"                                 \
-		    , debug_str()                                     \
-		    , other->debug_str()                              \
+		    , code_debug_str(self)                            \
+		    ,code_debug_str(other)                            \
 		);                                                    \
-	                                                          \
+                                                              \
 		return false;                                         \
 	}
 
 	#define check_member_str( str )                                 \
-	if ( str != other->str )                                        \
+	if ( ! str_are_equal( self->str, other->str ) )                 \
 	{                                                               \
 		log_fmt("\nAST::is_equal: Member string - "#str " failed\n" \
 				"AST  : %S\n"                                       \
 				"Other: %S\n"                                       \
-			, debug_str()                                           \
-			, other->debug_str()                                    \
+			, code_debug_str(self)                                  \
+			,code_debug_str(other)                                  \
 		);                                                          \
 	                                                                \
 		return false;                                               \
 	}
 
-	#define check_member_content( content )                               \
-	if ( content != other->content )                                      \
-	{                                                                     \
-		log_fmt("\nAST::is_equal: Member content - "#content " failed\n"  \
-				"AST  : %S\n"                                             \
-				"Other: %S\n"                                             \
-			, debug_str()                                                 \
-			, other->debug_str()                                          \
-		);                                                                \
-                                                                          \
-		log_fmt("Content cannot be trusted to be unique with this check " \
-			"so it must be verified by eye for now\n"                     \
-			"AST   Content:\n%S\n"                                        \
-			"Other Content:\n%S\n"                                        \
-			, content.visualize_whitespace()                              \
-			, other->content.visualize_whitespace()                       \
-		);                                                                \
+	#define check_member_content( content )                                  \
+	if ( ! str_are_equal( self->content, other->content ))                   \
+	{                                                                        \
+		log_fmt("\nAST::is_equal: Member content - "#content " failed\n"     \
+				"AST  : %S\n"                                                \
+				"Other: %S\n"                                                \
+			, code_debug_str(self)                                           \
+			, code_debug_str(other)                                          \
+		);                                                                   \
+                                                                             \
+		log_fmt("Content cannot be trusted to be unique with this check "    \
+			"so it must be verified by eye for now\n"                        \
+			"AST   Content:\n%S\n"                                           \
+			"Other Content:\n%S\n"                                           \
+			, str_visualize_whitespace(self->content, _ctx->Allocator_Temp)  \
+			, str_visualize_whitespace(other->content, _ctx->Allocator_Temp) \
+		);                                                                   \
 	}
 
 	#define check_member_ast( ast )                                                                \
-	if ( ast )                                                                                     \
+	if ( self->ast )                                                                               \
 	{                                                                                              \
 		if ( other->ast == nullptr )                                                               \
 		{                                                                                          \
 			log_fmt("\nAST::is_equal: Failed for member " #ast " other equivalent param is null\n" \
-					"AST  : %s\n"                                                                  \
-					"Other: %s\n"                                                                  \
-					"For ast member: %s\n"                                                         \
-				, debug_str()                                                                      \
-				, other->debug_str()                                                               \
-				, ast->debug_str()                                                                 \
+					"AST  : %S\n"                                                                  \
+					"Other: %S\n"                                                                  \
+					"For ast member: %S\n"                                                         \
+				, code_debug_str(self)                                                             \
+				, code_debug_str(other)                                                            \
+				, code_debug_str(self->ast)                                                        \
 			);                                                                                     \
                                                                                                    \
 			return false;                                                                          \
 		}                                                                                          \
                                                                                                    \
-		if ( ! ast->is_equal( other->ast ) )                                                       \
+		if ( ! code_is_equal(self->ast, other->ast ) )                                             \
 		{                                                                                          \
 			log_fmt( "\nAST::is_equal: Failed for " #ast"\n"                                       \
-			         "AST  : %S\n"                                                                 \
-			         "Other: %S\n"                                                                 \
-			         "For     ast member: %S\n"                                                    \
-			         "other's ast member: %S\n"                                                    \
-				, debug_str()                                                                      \
-				, other->debug_str()                                                               \
-				, ast->debug_str()                                                                 \
-				, other->ast->debug_str()                                                          \
+					"AST  : %S\n"                                                                  \
+					"Other: %S\n"                                                                  \
+					"For     ast member: %S\n"                                                     \
+					"other's ast member: %S\n"                                                     \
+				, code_debug_str(self)                                                             \
+				, code_debug_str(other)                                                            \
+				, code_debug_str(self->ast)                                                        \
+				, code_debug_str(other->ast)                                                       \
 			);                                                                                     \
 		                                                                                           \
 			return false;                                                                          \
 		}                                                                                          \
 	}
 
-		case NewLine:
-		case Access_Public:
-		case Access_Protected:
-		case Access_Private:
-		case Preprocess_Else:
-		case Preprocess_EndIf:
+		case CT_NewLine:
+		case CT_Access_Public:
+		case CT_Access_Protected:
+		case CT_Access_Private:
+		case CT_Preprocess_Else:
+		case CT_Preprocess_EndIf:
 			return true;
 
 
 		// Comments are not validated.
-		case Comment:
+		case CT_Comment:
 			return true;
 
-		case Execution:
-		case PlatformAttributes:
-		case Untyped:
+		case CT_Execution:
+		case CT_PlatformAttributes:
+		case CT_Untyped:
 		{
 			check_member_content( Content );
-
 			return true;
 		}
 
-		case Class_Fwd:
-		case Struct_Fwd:
+		case CT_Class_Fwd:
+		case CT_Struct_Fwd:
 		{
 			check_member_str( Name );
 			check_member_ast( ParentType );
@@ -939,8 +940,8 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Class:
-		case Struct:
+		case CT_Class:
+		case CT_Struct:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
@@ -952,7 +953,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Constructor:
+		case CT_Constructor:
 		{
 			check_member_ast( InitializerList );
 			check_member_ast( Params );
@@ -961,7 +962,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Constructor_Fwd:
+		case CT_Constructor_Fwd:
 		{
 			check_member_ast( InitializerList );
 			check_member_ast( Params );
@@ -969,7 +970,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Destructor:
+		case CT_Destructor:
 		{
 			check_member_ast( Specs );
 			check_member_ast( Body );
@@ -977,37 +978,39 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Destructor_Fwd:
+		case CT_Destructor_Fwd:
 		{
 			check_member_ast( Specs );
 
 			return true;
 		}
 
-		case Enum:
-		case Enum_Class:
+		case CT_Enum:
+		case CT_Enum_Class:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
 			check_member_ast( Attributes );
 			check_member_ast( UnderlyingType );
 			check_member_ast( Body );
+			check_member_ast( UnderlyingTypeMacro );
 
 			return true;
 		}
 
-		case Enum_Fwd:
-		case Enum_Class_Fwd:
+		case CT_Enum_Fwd:
+		case CT_Enum_Class_Fwd:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
 			check_member_ast( Attributes );
 			check_member_ast( UnderlyingType );
+			check_member_ast( UnderlyingTypeMacro );
 
 			return true;
 		}
 
-		case Extern_Linkage:
+		case CT_Extern_Linkage:
 		{
 			check_member_str( Name );
 			check_member_ast( Body );
@@ -1015,7 +1018,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Friend:
+		case CT_Friend:
 		{
 			check_member_str( Name );
 			check_member_ast( Declaration );
@@ -1023,7 +1026,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Function:
+		case CT_Function:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
@@ -1036,7 +1039,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Function_Fwd:
+		case CT_Function_Fwd:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
@@ -1048,7 +1051,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Module:
+		case CT_Module:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
@@ -1056,7 +1059,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Namespace:
+		case CT_Namespace:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
@@ -1065,8 +1068,8 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Operator:
-		case Operator_Member:
+		case CT_Operator:
+		case CT_Operator_Member:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
@@ -1079,8 +1082,8 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Operator_Fwd:
-		case Operator_Member_Fwd:
+		case CT_Operator_Fwd:
+		case CT_Operator_Member_Fwd:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
@@ -1092,7 +1095,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Operator_Cast:
+		case CT_Operator_Cast:
 		{
 			check_member_str( Name );
 			check_member_ast( Specs );
@@ -1102,7 +1105,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Operator_Cast_Fwd:
+		case CT_Operator_Cast_Fwd:
 		{
 			check_member_str( Name );
 			check_member_ast( Specs );
@@ -1111,12 +1114,12 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Parameters:
+		case CT_Parameters:
 		{
-			if ( NumEntries > 1 )
+			if ( self->NumEntries > 1 )
 			{
-				AST* curr       = this;
-				AST* curr_other = other;
+				Code curr       = self;
+				Code curr_other = other;
 				while ( curr != nullptr  )
 				{
 					if ( curr )
@@ -1124,56 +1127,56 @@ bool AST::is_equal( AST* other )
 						if ( curr_other == nullptr )
 						{
 							log_fmt("\nAST::is_equal: Failed for parameter, other equivalent param is null\n"
-							        "AST  : %S\n"
-							        "Other: %S\n"
-							        "For ast member: %S\n"
-							    , curr->debug_str()
+									"AST  : %S\n"
+									"Other: %S\n"
+									"For ast member: %S\n"
+								, code_debug_str(curr)
 							);
 
 							return false;
 						}
 
-						if ( curr->Name != curr_other->Name )
+						if ( str_are_equal(curr->Name, curr_other->Name) )
 						{
 							log_fmt( "\nAST::is_equal: Failed for parameter name check\n"
 									"AST  : %S\n"
 									"Other: %S\n"
 									"For     ast member: %S\n"
 									"other's ast member: %S\n"
-								, debug_str()
-								, other->debug_str()
-								, curr->debug_str()
-								, curr_other->debug_str()
+								, code_debug_str(self)
+								, code_debug_str(other)
+								, code_debug_str(curr)
+								, code_debug_str(curr_other)
 							);
 							return false;
 						}
 
-						if ( curr->ValueType && ! curr->ValueType->is_equal(curr_other->ValueType) )
+						if ( curr->ValueType && ! code_is_equal(curr->ValueType, curr_other->ValueType) )
 						{
 							log_fmt( "\nAST::is_equal: Failed for parameter value type check\n"
 									"AST  : %S\n"
 									"Other: %S\n"
 									"For     ast member: %S\n"
 									"other's ast member: %S\n"
-								, debug_str()
-								, other->debug_str()
-								, curr->debug_str()
-								, curr_other->debug_str()
+								, code_debug_str(self)
+								, code_debug_str(other)
+								, code_debug_str(curr)
+								, code_debug_str(curr_other)
 							);
 							return false;
 						}
 
-						if ( curr->Value && ! curr->Value->is_equal(curr_other->Value) )
+						if ( curr->Value && ! code_is_equal(curr->Value, curr_other->Value) )
 						{
 							log_fmt( "\nAST::is_equal: Failed for parameter value check\n"
 									"AST  : %S\n"
 									"Other: %S\n"
 									"For     ast member: %S\n"
 									"other's ast member: %S\n"
-								, debug_str()
-								, other->debug_str()
-								, curr->debug_str()
-								, curr_other->debug_str()
+								, code_debug_str(self)
+								, code_debug_str(other)
+								, code_debug_str(curr)
+								, code_debug_str(curr_other)
 							);
 							return false;
 						}
@@ -1196,44 +1199,50 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Preprocess_Define:
+		case CT_Parameters_Define:
+		{
+			// TODO(ED): Needs implementaton
+			log_failure("code_is_equal: NOT IMPLEMENTED for CT_Parameters_Define");
+			return false;
+		}
+
+		case CT_Preprocess_Define:
 		{
 			check_member_str( Name );
-			check_member_content( Content );
-
+			check_member_content( Body->Content );
 			return true;
 		}
 
-		case Preprocess_If:
-		case Preprocess_IfDef:
-		case Preprocess_IfNotDef:
-		case Preprocess_ElIf:
+		case CT_Preprocess_If:
+		case CT_Preprocess_IfDef:
+		case CT_Preprocess_IfNotDef:
+		case CT_Preprocess_ElIf:
 		{
 			check_member_content( Content );
 
 			return true;
 		}
 
-		case Preprocess_Include:
-		case Preprocess_Pragma:
+		case CT_Preprocess_Include:
+		case CT_Preprocess_Pragma:
 		{
 			check_member_content( Content );
 
 			return true;
 		}
 
-		case Specifiers:
+		case CT_Specifiers:
 		{
 			check_member_val( NumEntries );
 			check_member_str( Name );
-			for ( s32 idx = 0; idx < NumEntries; ++idx )
+			for ( s32 idx = 0; idx < self->NumEntries; ++idx )
 			{
 				check_member_val( ArrSpecs[ idx ] );
 			}
 			return true;
 		}
 
-		case Template:
+		case CT_Template:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
@@ -1243,7 +1252,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Typedef:
+		case CT_Typedef:
 		{
 			check_member_val( IsFunction );
 			check_member_val( ModuleFlags );
@@ -1253,7 +1262,7 @@ bool AST::is_equal( AST* other )
 
 			return true;
 		}
-		case Typename:
+		case CT_Typename:
 		{
 			check_member_val( IsParamPack );
 			check_member_str( Name );
@@ -1263,7 +1272,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Union:
+		case CT_Union:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
@@ -1273,8 +1282,15 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Using:
-		case Using_Namespace:
+		case CT_Union_Fwd:
+		{
+			check_member_val( ModuleFlags );
+			check_member_str( Name );
+			check_member_ast( Attributes );
+		}
+
+		case CT_Using:
+		case CT_Using_Namespace:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
@@ -1284,7 +1300,7 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Variable:
+		case CT_Variable:
 		{
 			check_member_val( ModuleFlags );
 			check_member_str( Name );
@@ -1298,44 +1314,44 @@ bool AST::is_equal( AST* other )
 			return true;
 		}
 
-		case Class_Body:
-		case Enum_Body:
-		case Export_Body:
-		case Global_Body:
-		case Namespace_Body:
-		case Struct_Body:
-		case Union_Body:
+		case CT_Class_Body:
+		case CT_Enum_Body:
+		case CT_Export_Body:
+		case CT_Global_Body:
+		case CT_Namespace_Body:
+		case CT_Struct_Body:
+		case CT_Union_Body:
 		{
 			check_member_ast( Front );
 			check_member_ast( Back );
 
-			AST* curr       = Front;
-			AST* curr_other = other->Front;
+			Code curr       = self->Front;
+			Code curr_other = other->Front;
 			while ( curr != nullptr )
 			{
 				if ( curr_other == nullptr )
 				{
 					log_fmt("\nAST::is_equal: Failed for body, other equivalent param is null\n"
-					        "AST  : %S\n"
-					        "Other: %S\n"
-					        "For ast member: %S\n"
-					    , curr->debug_str()
+							"AST  : %S\n"
+							"Other: %S\n"
+						, code_debug_str(curr)
+						, code_debug_str(other)
 					);
 
 					return false;
 				}
 
-				if ( ! curr->is_equal( curr_other ) )
+				if ( ! code_is_equal( curr, curr_other ) )
 				{
 					log_fmt( "\nAST::is_equal: Failed for body\n"
 							"AST  : %S\n"
 							"Other: %S\n"
 							"For     ast member: %S\n"
 							"other's ast member: %S\n"
-						, debug_str()
-						, other->debug_str()
-						, curr->debug_str()
-						, curr_other->debug_str()
+						, code_debug_str(self)
+						, code_debug_str(other)
+						, code_debug_str(curr)
+						, code_debug_str(curr_other)
 					);
 
 					return false;
@@ -1358,1505 +1374,1669 @@ bool AST::is_equal( AST* other )
 	return true;
 }
 
-bool AST::validate_body()
+bool code_validate_body(Code self)
 {
-	using namespace ECode;
-
-#define CheckEntries( Unallowed_Types )                                                               \
-	do                                                                                                \
-	{                                                                                                 \
-		for ( Code entry : cast<CodeBody>() )                                                         \
-		{                                                                                             \
-			switch ( entry->Type )                                                                    \
-			{                                                                                         \
-				Unallowed_Types                                                                       \
-					log_failure( "AST::validate_body: Invalid entry in body %s", entry.debug_str() ); \
-					return false;                                                                     \
-			}                                                                                         \
-		}                                                                                             \
-	}                                                                                                 \
-	while (0);
-
-	switch ( Type )
+	switch ( self->Type )
 	{
-		case Class_Body:
-			CheckEntries( GEN_AST_BODY_CLASS_UNALLOWED_TYPES );
-		break;
-		case Enum_Body:
-			for ( Code entry : cast<CodeBody>() )
+		case CT_Class_Body:
+		{
+			CodeBody body = cast(CodeBody, self);
+			for (Code code_entry = begin_CodeBody(body); code_entry != end_CodeBody(body); next_CodeBody(body, code_entry)) switch (code_entry->Type)
 			{
-				if ( entry->Type != Untyped )
+				GEN_AST_BODY_CLASS_UNALLOWED_TYPES_CASES:
+					log_failure("AST::validate_body: Invalid entry in body %S", code_debug_str(code_entry));
+				return false;
+
+				default:
+				continue;
+			}
+		}
+		break;
+		case CT_Enum_Body:
+		{
+			CodeBody body = cast(CodeBody, self);
+			for ( Code entry = begin_CodeBody(body); entry != end_CodeBody(body); next_CodeBody(body, entry) )
+			{
+				if ( entry->Type != CT_Untyped )
 				{
-					log_failure( "AST::validate_body: Invalid entry in enum body (needs to be untyped or comment) %s", entry.debug_str() );
+					log_failure( "AST::validate_body: Invalid entry in enum body (needs to be untyped or comment) %S", code_debug_str(entry) );
 					return false;
 				}
 			}
+		}
 		break;
-		case Export_Body:
-			CheckEntries( GEN_AST_BODY_CLASS_UNALLOWED_TYPES );
-		break;
-		case Extern_Linkage:
-			CheckEntries( GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES );
-		break;
-		case Function_Body:
-			CheckEntries( GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES );
-		break;
-		case Global_Body:
-			for (Code entry : cast<CodeBody>())
+		case CT_Export_Body:
+		{
+			CodeBody body = cast(CodeBody, self);
+			for (Code code_entry = begin_CodeBody(body); code_entry != end_CodeBody(body); next_CodeBody(body, code_entry)) switch (code_entry->Type)
 			{
-				switch (entry->Type)
+				GEN_AST_BODY_EXPORT_UNALLOWED_TYPES_CASES:
+					log_failure("AST::validate_body: Invalid entry in body %S", code_debug_str(code_entry));
+				return false;
+
+				default:
+				continue;
+			}
+		}
+		break;
+		case CT_Extern_Linkage:
+		{
+			CodeBody body = cast(CodeBody, self);
+			for (Code code_entry = begin_CodeBody(body); code_entry != end_CodeBody(body); next_CodeBody(body, code_entry)) switch (code_entry->Type)
+			{
+				GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES_CASES:
+					log_failure("AST::validate_body: Invalid entry in body %S", code_debug_str(code_entry));
+				return false;
+
+				default:
+				continue;
+			}
+		}
+		break;
+		case CT_Function_Body:
+		{
+			CodeBody body = cast(CodeBody, self);
+			for (Code code_entry = begin_CodeBody(body); code_entry != end_CodeBody(body); next_CodeBody(body, code_entry)) switch (code_entry->Type)
+			{
+				GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES_CASES:
+					log_failure("AST::validate_body: Invalid entry in body %S", code_debug_str(code_entry));
+				return false;
+
+				default:
+				continue;
+			}
+		}
+		break;
+		case CT_Global_Body:
+		{
+			CodeBody body = cast(CodeBody, self);
+			for ( Code entry = begin_CodeBody(body); entry != end_CodeBody(body); next_CodeBody(body, entry) )switch (entry->Type)
+			{
+				GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES_CASES:
+					log_failure("AST::validate_body: Invalid entry in body %S", code_debug_str(entry));
+				return false;
+			}
+		}
+		break;
+		case CT_Namespace_Body:
+		{
+			CodeBody body = cast(CodeBody, self);
+			for ( Code entry = begin_CodeBody(body); entry != end_CodeBody(body); next_CodeBody(body, entry) ) switch (entry->Type)
+			{
+				GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES_CASES:
+					log_failure("AST::validate_body: Invalid entry in body %S", code_debug_str(entry));
+				return false;
+			}
+		}
+		break;
+		case CT_Struct_Body:
+		{
+			CodeBody body = cast(CodeBody, self);
+			for ( Code entry = begin_CodeBody(body); entry != end_CodeBody(body); next_CodeBody(body, entry) ) switch (entry->Type)
+			{
+				GEN_AST_BODY_STRUCT_UNALLOWED_TYPES_CASES:
+					log_failure("AST::validate_body: Invalid entry in body %S", code_debug_str(entry));
+				return false;
+			}
+		}
+		break;
+		case CT_Union_Body:
+		{
+			CodeBody body = cast(CodeBody, self);
+			for ( Code entry = begin_CodeBody(body); entry != end_CodeBody(body); next_CodeBody(body, entry) )
+			{
+				if ( entry->Type != CT_Untyped )
 				{
-					case Access_Public:
-					case Access_Protected:
-					case Access_Private:
-					case PlatformAttributes:
-					case Class_Body:
-					case Enum_Body:
-					case Execution:
-					case Friend:
-					case Function_Body:
-					case Global_Body:
-					case Namespace_Body:
-					case Operator_Member:
-					case Operator_Member_Fwd:
-					case Parameters:
-					case Specifiers:
-					case Struct_Body:
-					case Typename:
-						log_failure("AST::validate_body: Invalid entry in body %s", entry.debug_str());
-					return false;
-				}
-			}
-		break;
-		case Namespace_Body:
-			CheckEntries( GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES );
-		break;
-		case Struct_Body:
-			CheckEntries( GEN_AST_BODY_STRUCT_UNALLOWED_TYPES );
-		break;
-		case Union_Body:
-			for ( Code entry : Body->cast<CodeBody>() )
-			{
-				if ( entry->Type != Untyped )
-				{
-					log_failure( "AST::validate_body: Invalid entry in union body (needs to be untyped or comment) %s", entry.debug_str() );
+					log_failure( "AST::validate_body: Invalid entry in union body (needs to be untyped or comment) %S", code_debug_str(entry) );
 					return false;
 				}
 			}
+		}
 		break;
 
 		default:
-			log_failure( "AST::validate_body: Invalid this AST does not have a body %s", debug_str() );
+			log_failure( "AST::validate_body: Invalid this AST does not have a body %S", code_debug_str(self) );
 			return false;
 	}
-
 	return false;
-
-#undef CheckEntries
 }
 
-String Code::to_string()
+inline
+StrBuilder attributes_to_strbuilder(CodeAttributes attributes) {
+	GEN_ASSERT(attributes);
+	char* raw = ccast(char*, str_duplicate( attributes->Content, _ctx->Allocator_Temp ).Ptr);
+	StrBuilder result = { raw };
+	return result;
+}
+
+inline
+void attributes_to_strbuilder_ref(CodeAttributes attributes, StrBuilder* result) {
+	GEN_ASSERT(attributes);
+	GEN_ASSERT(result);
+	strbuilder_append_str(result, attributes->Content);
+}
+
+StrBuilder body_to_strbuilder(CodeBody body)
 {
-	if ( ast == nullptr )
+	GEN_ASSERT(body);
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 128 );
+	switch ( body->Type )
 	{
-		log_failure( "Code::to_string: Cannot convert code to string, AST is null!" );
-		return { nullptr };
-	}
-	return rcast( AST*, ast )->to_string();
-}
-
-String CodeAttributes::to_string()
-{
-	return ast->Content.duplicate( GlobalAllocator );
-}
-
-String CodeBody::to_string()
-{
-	String result = String::make( GlobalAllocator, "" );
-	switch ( ast->Type )
-	{
-		using namespace ECode;
-		case Untyped:
-		case Execution:
-			result.append( raw()->Content );
+		case CT_Untyped:
+		case CT_Execution:
+			strbuilder_append_str( & result, cast(Code, body)->Content );
 		break;
 
-		case Enum_Body:
-		case Class_Body:
-		case Extern_Linkage_Body:
-		case Function_Body:
-		case Global_Body:
-		case Namespace_Body:
-		case Struct_Body:
-		case Union_Body:
-			to_string( result );
+		case CT_Enum_Body:
+		case CT_Class_Body:
+		case CT_Extern_Linkage_Body:
+		case CT_Function_Body:
+		case CT_Global_Body:
+		case CT_Namespace_Body:
+		case CT_Struct_Body:
+		case CT_Union_Body:
+			body_to_strbuilder_ref( body, & result );
 		break;
 
-		case Export_Body:
-			to_string_export( result );
+		case CT_Export_Body:
+			body_to_strbuilder_export( body, & result );
 		break;
 	}
 	return result;
 }
 
-void CodeBody::to_string( String& result )
+void body_to_strbuilder_ref( CodeBody body, StrBuilder* result )
 {
-	Code curr = ast->Front;
-	s32  left = ast->NumEntries;
+	GEN_ASSERT(body   != nullptr);
+	GEN_ASSERT(result != nullptr);
+	Code curr = body->Front;
+	s32  left = body->NumEntries;
 	while ( left -- )
 	{
-		result.append_fmt( "%S", curr.to_string() );
+		code_to_strbuilder_ptr(curr, result);
+		// strbuilder_append_fmt( result, "%SB", code_to_strbuilder(curr) );
 		++curr;
 	}
 }
 
-void CodeBody::to_string_export( String& result )
+void body_to_strbuilder_export( CodeBody body, StrBuilder* result )
 {
-	result.append_fmt( "export\n{\n" );
+	GEN_ASSERT(body   != nullptr);
+	GEN_ASSERT(result != nullptr);
+	strbuilder_append_fmt( result, "export\n{\n" );
 
-	Code curr = *this;
-	s32  left = ast->NumEntries;
+	Code curr = cast(Code, body);
+	s32  left = body->NumEntries;
 	while ( left-- )
 	{
-		result.append_fmt( "%S", curr.to_string() );
+		code_to_strbuilder_ptr(curr, result);
+		// strbuilder_append_fmt( result, "%SB", code_to_strbuilder(curr) );
 		++curr;
 	}
 
-	result.append_fmt( "};\n" );
+	strbuilder_append_fmt( result, "};\n" );
 }
 
-String CodeComment::to_string()
-{
-	return ast->Content.duplicate( GlobalAllocator );
+inline
+StrBuilder comment_to_strbuilder(CodeComment comment) {
+	GEN_ASSERT(comment);
+	char* raw = ccast(char*, str_duplicate( comment->Content, _ctx->Allocator_Temp ).Ptr);
+	StrBuilder result = { raw };
+	return result;
 }
 
-String CodeConstructor::to_string()
+inline
+void comment_to_strbuilder_ref(CodeComment comment, StrBuilder* result) {
+	GEN_ASSERT(comment);
+	GEN_ASSERT(result);
+	strbuilder_append_str(result, comment->Content);
+}
+
+StrBuilder constructor_to_strbuilder(CodeConstructor self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	switch (ast->Type)
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 128 );
+	switch (self->Type)
 	{
-		using namespace ECode;
-		case Constructor:
-			to_string_def( result );
+		case CT_Constructor:
+			constructor_to_strbuilder_def( self, & result );
 		break;
-		case Constructor_Fwd:
-			to_string_fwd( result );
+		case CT_Constructor_Fwd:
+			constructor_to_strbuilder_fwd( self, & result );
 		break;
 	}
 	return result;
 }
 
-void CodeConstructor::to_string_def( String& result )
+void constructor_to_strbuilder_def(CodeConstructor self, StrBuilder* result )
 {
-	AST* ClassStructParent = ast->Parent->Parent;
+	Code ClassStructParent = self->Parent->Parent;
 	if (ClassStructParent) {
-		result.append( ClassStructParent->Name );
+		strbuilder_append_str( result, ClassStructParent->Name );
 	}
 	else {
-		result.append( ast->Name );
+		strbuilder_append_str( result, self->Name );
 	}
 
-	if ( ast->Params )
-		result.append_fmt( "( %S )", ast->Params.to_string() );
+	if ( self->Params )
+		strbuilder_append_fmt( result, "( %SB )", params_to_strbuilder(self->Params) );
 	else
-		result.append( "()" );
+		strbuilder_append_str( result, txt("()") );
 
-	if ( ast->InitializerList )
-		result.append_fmt( " : %S", ast->InitializerList.to_string() );
+	if ( self->InitializerList )
+		strbuilder_append_fmt( result, " : %SB", code_to_strbuilder(self->InitializerList) );
 
-	if ( ast->InlineCmt )
-		result.append_fmt( " // %S", ast->InlineCmt->Content );
+	if ( self->InlineCmt )
+		strbuilder_append_fmt( result, " // %S", self->InlineCmt->Content );
 
-	result.append_fmt( "\n{\n%S\n}\n", ast->Body.to_string() );
+	strbuilder_append_fmt( result, "\n{\n%SB\n}\n", code_to_strbuilder(self->Body) );
 }
 
-void CodeConstructor::to_string_fwd( String& result )
+void constructor_to_strbuilder_fwd(CodeConstructor self, StrBuilder* result )
 {
-	AST* ClassStructParent = ast->Parent->Parent;
+	Code ClassStructParent = self->Parent->Parent;
 	if (ClassStructParent) {
-		result.append( ClassStructParent->Name );
+		strbuilder_append_str( result, ClassStructParent->Name );
 	}
 	else {
-		result.append( ast->Name );
+		strbuilder_append_str( result, self->Name );
 	}
 
-	if ( ast->Params )
-		result.append_fmt( "( %S )", ast->Params.to_string() );
+	if ( self->Params )
+		strbuilder_append_fmt( result, "( %SB )", params_to_strbuilder(self->Params) );
 	else
-		result.append_fmt("()");
+		strbuilder_append_fmt( result, "()");
 
-	if (ast->Body)
-		result.append_fmt( " = %S", ast->Body.to_string() );
+	if (self->Body)
+		strbuilder_append_fmt( result, " = %SB", code_to_strbuilder(self->Body) );
 
-	if ( ast->InlineCmt )
-		result.append_fmt( "; // %S\n", ast->InlineCmt->Content );
+	if ( self->InlineCmt )
+		strbuilder_append_fmt( result, "; // %S\n", self->InlineCmt->Content );
 	else
-		result.append( ";\n" );
+		strbuilder_append_str( result, txt(";\n") );
 }
 
-String CodeClass::to_string()
+StrBuilder class_to_strbuilder( CodeClass self )
 {
-	String result = String::make( GlobalAllocator, "" );
-	switch ( ast->Type )
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 512 );
+	switch ( self->Type )
 	{
-		using namespace ECode;
-		case Class:
-			to_string_def( result );
+		case CT_Class:
+			class_to_strbuilder_def(self, & result );
 		break;
-		case Class_Fwd:
-			to_string_fwd( result );
+		case CT_Class_Fwd:
+			class_to_strbuilder_fwd(self, & result );
 		break;
 	}
 	return result;
 }
 
-void CodeClass::to_string_def( String& result )
+void class_to_strbuilder_def( CodeClass self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	GEN_ASSERT(self);
 
-	result.append( "class " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	if ( ast->Attributes )
+	strbuilder_append_str( result, txt("class ") );
+
+	if ( self->Attributes )
 	{
-		result.append_fmt( "%S ", ast->Attributes.to_string() );
+		strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 	}
 
-	if ( ast->ParentType )
+	if ( self->ParentType )
 	{
-		char const* access_level = to_str( ast->ParentAccess );
+		Str access_level = access_spec_to_str( self->ParentAccess );
+		strbuilder_append_fmt( result, "%S : %S %SB", self->Name, access_level, typename_to_strbuilder(self->ParentType) );
 
-		result.append_fmt( "%S : %s %S", ast->Name, access_level, ast->ParentType.to_string() );
-
-		CodeType interface = ast->ParentType->Next->cast< CodeType >();
+		CodeTypename interface = cast(CodeTypename, self->ParentType->Next);
 		if ( interface )
-			result.append( "\n" );
+			strbuilder_append_str( result, txt("\n") );
 
 		while ( interface )
 		{
-			result.append_fmt( ", %S", interface.to_string() );
-			interface = interface->Next ? interface->Next->cast< CodeType >() : CodeType { nullptr };
+			strbuilder_append_fmt( result, ", public %SB", typename_to_strbuilder(interface) );
+			interface = interface->Next ? cast(CodeTypename, interface->Next) : NullCode;
 		}
 	}
-	else if ( ast->Name )
+	else if ( self->Name.Len )
 	{
-		result.append( ast->Name );
+		strbuilder_append_str( result, self->Name );
 	}
 
-	if ( ast->InlineCmt )
+	if ( self->InlineCmt )
 	{
-		result.append_fmt( " // %S", ast->InlineCmt->Content );
+		strbuilder_append_fmt( result, " // %S", self->InlineCmt->Content );
 	}
 
-	result.append_fmt( "\n{\n%S\n}", ast->Body.to_string() );
+	strbuilder_append_fmt( result, "\n{\n%SB\n}", body_to_strbuilder(self->Body) );
 
-	if ( ast->Parent.ast == nullptr || ( ast->Parent->Type != ECode::Typedef && ast->Parent->Type != ECode::Variable ) )
-		result.append(";\n");
+	if ( self->Parent == nullptr || ( self->Parent->Type != CT_Typedef && self->Parent->Type != CT_Variable ) )
+		strbuilder_append_str( result, txt(";\n") );
 }
 
-void CodeClass::to_string_fwd( String& result )
+void class_to_strbuilder_fwd( CodeClass self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	GEN_ASSERT(self);
 
-	if ( ast->Attributes )
-		result.append_fmt( "class %S %S", ast->Attributes.to_string(), ast->Name );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	else result.append_fmt( "class %S", ast->Name );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "class %SB %S", attributes_to_strbuilder(self->Attributes), self->Name );
+
+	else strbuilder_append_fmt( result, "class %S", self->Name );
 
 	// Check if it can have an end-statement
-	if ( ast->Parent.ast == nullptr || ( ast->Parent->Type != ECode::Typedef && ast->Parent->Type != ECode::Variable ) )
+	if ( self->Parent == nullptr || ( self->Parent->Type != CT_Typedef && self->Parent->Type != CT_Variable ) )
 	{
-		if ( ast->InlineCmt )
-			result.append_fmt( "; // %S\n", ast->InlineCmt->Content );
+		if ( self->InlineCmt )
+			strbuilder_append_fmt( result, "; // %S\n", self->InlineCmt->Content );
 		else
-			result.append(";\n");
+			strbuilder_append_str( result, txt(";\n") );
 	}
 }
 
-String CodeDefine::to_string()
+StrBuilder define_to_strbuilder(CodeDefine define)
 {
-	return String::fmt_buf( GlobalAllocator, "#define %S %S\n", ast->Name, ast->Content );
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 512 );
+	define_to_strbuilder_ref(define, & result);
+	return result;
 }
 
-void CodeDefine::to_string( String& result )
+void define_to_strbuilder_ref(CodeDefine define, StrBuilder* result )
 {
-	result.append_fmt( "#define %S %S\n", ast->Name, ast->Content );
+	GEN_ASSERT(define);
+	GEN_ASSERT(define->Body);
+	GEN_ASSERT(define->Body->Content.Ptr && define->Body->Content.Len > 0);
+	if (define->Params) {
+		StrBuilder params_builder = define_params_to_strbuilder(define->Params);
+		strbuilder_append_fmt( result, "#define %S(%S) %S", define->Name, strbuilder_to_str(params_builder), define->Body->Content );
+	}
+	else {
+		strbuilder_append_fmt( result, "#define %S %S", define->Name, define->Body->Content );
+	}
 }
 
-String CodeDestructor::to_string()
+StrBuilder define_params_to_strbuilder(CodeDefineParams params)
 {
-	String result = String::make( GlobalAllocator, "" );
-	switch ( ast->Type )
+	GEN_ASSERT(params);
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 128 );
+	define_params_to_strbuilder_ref( params, & result );
+	return result;
+}
+
+void define_params_to_strbuilder_ref(CodeDefineParams self, StrBuilder* result)
+{
+	GEN_ASSERT(self);
+	GEN_ASSERT(result);
+	if ( self->Name.Ptr && self->Name.Len )
 	{
-		using namespace ECode;
-		case Destructor:
-			to_string_def( result );
+		strbuilder_append_fmt( result, " %S", self->Name );
+	}
+	if ( self->NumEntries - 1 > 0 )
+	{
+		for ( CodeDefineParams param = begin_CodeDefineParams(self->Next); param != end_CodeDefineParams(self->Next); param = next_CodeDefineParams(self->Next, param) )
+		{
+			strbuilder_append_fmt( result, ", %SB", define_params_to_strbuilder(param) );
+		}
+	}
+}
+
+StrBuilder destructor_to_strbuilder(CodeDestructor self)
+{
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 128 );
+	switch ( self->Type )
+	{
+		case CT_Destructor:
+			destructor_to_strbuilder_def( self, & result );
 		break;
-		case Destructor_Fwd:
-			to_string_fwd( result );
+		case CT_Destructor_Fwd:
+			destructor_to_strbuilder_fwd( self, & result );
 		break;
 	}
 	return result;
 }
 
-void CodeDestructor::to_string_def( String& result )
+void destructor_to_strbuilder_def(CodeDestructor self, StrBuilder* result )
 {
-	if ( ast->Name )
+	if ( self->Name.Len )
 	{
-		result.append_fmt( "%S()", ast->Name );
+		strbuilder_append_fmt( result, "%S()", self->Name );
 	}
-	else if ( ast->Specs )
+	else if ( self->Specs )
 	{
-		if ( ast->Specs.has( ESpecifier::Virtual ) )
-			result.append_fmt( "virtual ~%S()", ast->Parent->Name );
+		if ( specifiers_has(self->Specs, Spec_Virtual ) )
+			strbuilder_append_fmt( result, "virtual ~%S()", self->Parent->Name );
 		else
-			result.append_fmt( "~%S()", ast->Parent->Name );
+			strbuilder_append_fmt( result, "~%S()", self->Parent->Name );
 	}
 	else
-		result.append_fmt( "~%S()", ast->Parent->Name );
+		strbuilder_append_fmt( result, "~%S()", self->Parent->Name );
 
-	result.append_fmt( "\n{\n%S\n}\n", ast->Body.to_string() );
+	strbuilder_append_fmt( result, "\n{\n%SB\n}\n", code_to_strbuilder(self->Body) );
 }
 
-void CodeDestructor::to_string_fwd( String& result )
+void destructor_to_strbuilder_fwd(CodeDestructor self, StrBuilder* result )
 {
-	if ( ast->Specs )
+	if ( self->Specs )
 	{
-		if ( ast->Specs.has( ESpecifier::Virtual ) )
-			result.append_fmt( "virtual ~%S();\n", ast->Parent->Name );
+		if ( specifiers_has(self->Specs, Spec_Virtual ) )
+			strbuilder_append_fmt( result, "virtual ~%S();\n", self->Parent->Name );
 		else
-			result.append_fmt( "~%S()", ast->Parent->Name );
+			strbuilder_append_fmt( result, "~%S()", self->Parent->Name );
 
-		if ( ast->Specs.has( ESpecifier::Pure ) )
-			result.append( " = 0;" );
-		else if (ast->Body)
-			result.append_fmt( " = %S;", ast->Body.to_string() );
+		if ( specifiers_has(self->Specs, Spec_Pure ) )
+			strbuilder_append_str( result, txt(" = 0;") );
+		else if (self->Body)
+			strbuilder_append_fmt( result, " = %SB;", code_to_strbuilder(self->Body) );
 	}
 	else
-		result.append_fmt( "~%S();", ast->Parent->Name );
+		strbuilder_append_fmt( result, "~%S();", self->Parent->Name );
 
-	if ( ast->InlineCmt )
-		result.append_fmt( "  %S", ast->InlineCmt->Content );
+	if ( self->InlineCmt )
+		strbuilder_append_fmt( result, "  %S", self->InlineCmt->Content );
 	else
-		result.append("\n");
+		strbuilder_append_str( result, txt("\n"));
 }
 
-String CodeEnum::to_string()
+StrBuilder enum_to_strbuilder(CodeEnum self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	switch ( ast->Type )
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 512 );
+	switch ( self->Type )
 	{
-		using namespace ECode;
-		case Enum:
-			to_string_def( result );
+		case CT_Enum:
+			enum_to_strbuilder_def(self, & result );
 		break;
-		case Enum_Fwd:
-			to_string_fwd( result );
+		case CT_Enum_Fwd:
+			enum_to_strbuilder_fwd(self, & result );
 		break;
-		case Enum_Class:
-			to_string_class_def( result );
+		case CT_Enum_Class:
+			enum_to_strbuilder_class_def(self, & result );
 		break;
-		case Enum_Class_Fwd:
-			to_string_class_fwd( result );
+		case CT_Enum_Class_Fwd:
+			enum_to_strbuilder_class_fwd(self, & result );
 		break;
 	}
 	return result;
 }
 
-void CodeEnum::to_string_def( String& result )
+void enum_to_strbuilder_def(CodeEnum self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	if ( ast->Attributes || ast->UnderlyingType )
+	if ( self->Attributes || self->UnderlyingType || self->UnderlyingTypeMacro )
 	{
-		result.append( "enum " );
+		strbuilder_append_str( result, txt("enum ") );
 
-		if ( ast->Attributes )
-			result.append_fmt( "%S ", ast->Attributes.to_string() );
+		if ( self->Attributes )
+			strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 
-		if ( ast->UnderlyingType )
-			result.append_fmt( "%S : %S\n{\n%S\n}"
-				, ast->Name
-				, ast->UnderlyingType.to_string()
-				, ast->Body.to_string()
+		if ( self->UnderlyingType )
+			strbuilder_append_fmt( result, "%S : %SB\n{\n%SB\n}"
+				, self->Name
+				, typename_to_strbuilder(self->UnderlyingType)
+				, body_to_strbuilder(self->Body)
+			);
+		else if ( self->UnderlyingTypeMacro )
+			strbuilder_append_fmt( result, "%S %SB\n{\n%SB\n}"
+				, self->Name
+				, code_to_strbuilder(self->UnderlyingTypeMacro)
+				, body_to_strbuilder(self->Body)
 			);
 
-		else result.append_fmt( "%S\n{\n%S\n}", ast->Name, ast->Body.to_string() );
+		else strbuilder_append_fmt( result, "%S\n{\n%SB\n}", self->Name, body_to_strbuilder(self->Body) );
 	}
-	else result.append_fmt( "enum %S\n{\n%S\n}", ast->Name, ast->Body.to_string() );
+	else strbuilder_append_fmt( result, "enum %S\n{\n%SB\n}", self->Name, body_to_strbuilder(self->Body) );
 
-	if ( ast->Parent.ast == nullptr || ( ast->Parent->Type != ECode::Typedef && ast->Parent->Type != ECode::Variable ) )
-		result.append(";\n");
+	if ( self->Parent == nullptr || ( self->Parent->Type != CT_Typedef && self->Parent->Type != CT_Variable ) )
+		strbuilder_append_str( result, txt(";\n"));
 }
 
-void CodeEnum::to_string_fwd( String& result )
+void enum_to_strbuilder_fwd(CodeEnum self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	if ( ast->Attributes )
-		result.append_fmt( "%S ", ast->Attributes.to_string() );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 
-	result.append_fmt( "enum %S : %S", ast->Name, ast->UnderlyingType.to_string() );
-
-	if ( ast->Parent.ast == nullptr || ( ast->Parent->Type != ECode::Typedef && ast->Parent->Type != ECode::Variable ) )
+	if ( self->UnderlyingType )
+		strbuilder_append_fmt( result, "enum %S : %SB", self->Name, typename_to_strbuilder(self->UnderlyingType) );
+	else if (self->UnderlyingTypeMacro)
 	{
-		if ( ast->InlineCmt )
-			result.append_fmt(";  %S", ast->InlineCmt->Content );
+		log_fmt("IDENTIFIED A UNDERLYING ENUM MACRO");
+		strbuilder_append_fmt( result, "enum %S %SB", self->Name, code_to_strbuilder(self->UnderlyingTypeMacro) );
+	}
+	else
+		strbuilder_append_fmt( result, "enum %S", self->Name );
+
+	if ( self->Parent == nullptr || ( self->Parent->Type != CT_Typedef && self->Parent->Type != CT_Variable ) )
+	{
+		if ( self->InlineCmt )
+			strbuilder_append_fmt( result, ";  %S", self->InlineCmt->Content );
 		else
-			result.append(";\n");
+			strbuilder_append_str( result, txt(";\n"));
 	}
 }
 
-void CodeEnum::to_string_class_def( String& result )
+void enum_to_strbuilder_class_def(CodeEnum self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	if ( ast->Attributes || ast->UnderlyingType )
+	if ( self->Attributes || self->UnderlyingType )
 	{
-		result.append( "enum class " );
+		strbuilder_append_str( result, txt("enum class ") );
 
-		if ( ast->Attributes )
+		if ( self->Attributes )
 		{
-			result.append_fmt( "%S ", ast->Attributes.to_string() );
+			strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 		}
 
-		if ( ast->UnderlyingType )
+		if ( self->UnderlyingType )
 		{
-			result.append_fmt( "%S : %S\n{\n%S\n}", ast->Name, ast->UnderlyingType.to_string(), ast->Body.to_string() );
+			strbuilder_append_fmt( result, "%S : %SB\n{\n%SB\n}", self->Name, typename_to_strbuilder(self->UnderlyingType), body_to_strbuilder(self->Body) );
 		}
 		else
 		{
-			result.append_fmt( "%S\n{\n%S\n}", ast->Name, ast->Body.to_string() );
+			strbuilder_append_fmt( result, "%S\n{\n%SB\n}", self->Name, body_to_strbuilder(self->Body) );
 		}
 	}
 	else
 	{
-		result.append_fmt( "enum class %S\n{\n%S\n}", ast->Body.to_string() );
+		strbuilder_append_fmt( result, "enum %S\n{\n%SB\n}", self->Name, body_to_strbuilder(self->Body) );
 	}
 
-	if ( ast->Parent.ast == nullptr || ( ast->Parent->Type != ECode::Typedef && ast->Parent->Type != ECode::Variable ) )
-		result.append(";\n");
+	if ( self->Parent == nullptr || ( self->Parent->Type != CT_Typedef && self->Parent->Type != CT_Variable ) )
+		strbuilder_append_str( result, txt(";\n"));
 }
 
-void CodeEnum::to_string_class_fwd( String& result )
+void enum_to_strbuilder_class_fwd(CodeEnum self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	result.append( "enum class " );
+	strbuilder_append_str( result, txt("enum class ") );
 
-	if ( ast->Attributes )
-		result.append_fmt( "%S ", ast->Attributes.to_string() );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 
-	result.append_fmt( "%S : %S", ast->Name, ast->UnderlyingType.to_string() );
+	strbuilder_append_fmt( result, "%S : %SB", self->Name, typename_to_strbuilder(self->UnderlyingType) );
 
-	if ( ast->Parent.ast == nullptr || ( ast->Parent->Type != ECode::Typedef && ast->Parent->Type != ECode::Variable ) )
+	if ( self->Parent == nullptr || ( self->Parent->Type != CT_Typedef && self->Parent->Type != CT_Variable ) )
 	{
-		if ( ast->InlineCmt )
-			result.append_fmt(";  %S", ast->InlineCmt->Content );
+		if ( self->InlineCmt )
+			strbuilder_append_fmt( result, ";  %S", self->InlineCmt->Content );
 		else
-			result.append(";\n");
+			strbuilder_append_str( result, txt(";\n"));
 	}
 }
 
-String CodeExec::to_string()
+StrBuilder exec_to_strbuilder(CodeExec exec)
 {
-	return ast->Content.duplicate( GlobalAllocator );
-}
-
-void CodeExtern::to_string( String& result )
-{
-	if ( ast->Body )
-		result.append_fmt( "extern \"%S\"\n{\n%S\n}\n", ast->Name, ast->Body.to_string() );
-	else
-		result.append_fmt( "extern \"%S\"\n{}\n", ast->Name );
-}
-
-String CodeInclude::to_string()
-{
-	return String::fmt_buf( GlobalAllocator, "#include %S\n", ast->Content );
-}
-
-void CodeInclude::to_string( String& result )
-{
-	result.append_fmt( "#include %S\n", ast->Content );
-}
-
-String CodeFriend::to_string()
-{
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
+	GEN_ASSERT(exec);
+	char* raw = ccast(char*, str_duplicate( exec->Content, _ctx->Allocator_Temp ).Ptr);
+	StrBuilder result = { raw };
 	return result;
 }
 
-void CodeFriend::to_string( String& result )
+void extern_to_strbuilder(CodeExtern self, StrBuilder* result )
 {
-	result.append_fmt( "friend %S", ast->Declaration->to_string() );
-
-	if ( ast->Declaration->Type != ECode::Function && result[ result.length() - 1 ] != ';' )
-	{
-		result.append( ";" );
-	}
-
-	if ( ast->InlineCmt )
-		result.append_fmt("  %S", ast->InlineCmt->Content );
+	if ( self->Body )
+		strbuilder_append_fmt( result, "extern \"%S\"\n{\n%SB\n}\n", self->Name, body_to_strbuilder(self->Body) );
 	else
-		result.append("\n");
+		strbuilder_append_fmt( result, "extern \"%S\"\n{}\n", self->Name );
 }
 
-String CodeFn::to_string()
+StrBuilder include_to_strbuilder(CodeInclude include)
 {
-	String result = String::make( GlobalAllocator, "" );
-	switch ( ast->Type )
+	return strbuilder_fmt_buf( _ctx->Allocator_Temp, "#include %S\n", include->Content );
+}
+
+void include_to_strbuilder_ref( CodeInclude include, StrBuilder* result )
+{
+	strbuilder_append_fmt( result, "#include %S\n", include->Content );
+}
+
+StrBuilder friend_to_strbuilder(CodeFriend self)
+{
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 256 );
+	friend_to_strbuilder_ref( self, & result );
+	return result;
+}
+
+void friend_to_strbuilder_ref(CodeFriend self, StrBuilder* result )
+{
+	strbuilder_append_fmt( result, "friend %SB", code_to_strbuilder(self->Declaration) );
+
+	if ( self->Declaration->Type != CT_Function && self->Declaration->Type != CT_Operator && (* result)[ strbuilder_length(* result) - 1 ] != ';' )
 	{
-		using namespace ECode;
-		case Function:
-			to_string_def( result );
+		strbuilder_append_str( result, txt(";") );
+	}
+
+	if ( self->InlineCmt )
+		strbuilder_append_fmt( result, "  %S", self->InlineCmt->Content );
+	else
+		strbuilder_append_str( result, txt("\n"));
+}
+
+StrBuilder fn_to_strbuilder(CodeFn self)
+{
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 512 );
+	switch ( self->Type )
+	{
+		case CT_Function:
+			fn_to_strbuilder_def(self, & result );
 		break;
-		case Function_Fwd:
-			to_string_fwd( result );
+		case CT_Function_Fwd:
+			fn_to_strbuilder_fwd(self, & result );
 		break;
 	}
 	return result;
 }
 
-void CodeFn::to_string_def( String& result )
+void fn_to_strbuilder_def(CodeFn self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export" );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export") );
 
-	if ( ast->Attributes )
-		result.append_fmt( " %S ", ast->Attributes.to_string() );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, " %SB ", attributes_to_strbuilder(self->Attributes) );
 
 	bool prefix_specs = false;
-	if ( ast->Specs )
+	if ( self->Specs )
 	{
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ! ESpecifier::is_trailing( spec ) )
+			if ( ! spec_is_trailing( * spec ) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( " %.*s", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, " %.*s", spec_str.Len, spec_str.Ptr );
 
 				prefix_specs = true;
 			}
 		}
 	}
 
-	if ( ast->Attributes || prefix_specs )
-		result.append( "\n" );
+	if ( self->Attributes || prefix_specs )
+		strbuilder_append_str( result, txt("\n") );
 
-	if ( ast->ReturnType )
-		result.append_fmt( "%S %S(", ast->ReturnType.to_string(), ast->Name );
+	if ( self->ReturnType )
+		strbuilder_append_fmt( result, "%SB %S(", typename_to_strbuilder(self->ReturnType), self->Name );
 
 	else
-		result.append_fmt( "%S(", ast->Name );
+		strbuilder_append_fmt( result, "%S(", self->Name );
 
-	if ( ast->Params )
-		result.append_fmt( "%S)", ast->Params.to_string() );
+	if ( self->Params )
+		strbuilder_append_fmt( result, "%SB)", params_to_strbuilder(self->Params) );
 
 	else
-		result.append( ")" );
+		strbuilder_append_str( result, txt(")") );
 
-	if ( ast->Specs )
+	if ( self->Specs )
 	{
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ESpecifier::is_trailing( spec ) )
+			if ( spec_is_trailing( * spec ) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( " %.*s", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, " %.*s", spec_str.Len, spec_str.Ptr );
 			}
 		}
 	}
 
-	result.append_fmt( "\n{\n%S\n}\n", ast->Body.to_string() );
+	strbuilder_append_fmt( result, "\n{\n%SB\n}\n", body_to_strbuilder(self->Body) );
 }
 
-void CodeFn::to_string_fwd( String& result )
+void fn_to_strbuilder_fwd(CodeFn self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	if ( ast->Attributes )
-		result.append_fmt( "%S ", ast->Attributes.to_string() );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 
 	b32 prefix_specs = false;
-	if ( ast->Specs )
+	if ( self->Specs )
 	{
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ! ESpecifier::is_trailing( spec ) || ! (spec != ESpecifier::Pure) )
+			if ( ! spec_is_trailing( * spec ) || ! ( * spec != Spec_Pure) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( " %.*s", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, " %.*s", spec_str.Len, spec_str.Ptr );
 
 				prefix_specs = true;
 			}
 		}
 	}
 
-	if ( ast->Attributes || prefix_specs )
+	if ( self->Attributes || prefix_specs )
 	{
-		result.append("\n" );
+		strbuilder_append_str( result, txt("\n") );
 	}
 
-	if ( ast->ReturnType )
-		result.append_fmt( "%S %S(", ast->ReturnType.to_string(), ast->Name );
+	if ( self->ReturnType )
+		strbuilder_append_fmt( result, "%SB %S(", typename_to_strbuilder(self->ReturnType), self->Name );
 
 	else
-		result.append_fmt( "%S(", ast->Name );
+		strbuilder_append_fmt( result, "%S(", self->Name );
 
-	if ( ast->Params )
-		result.append_fmt( "%S)", ast->Params.to_string() );
+	if ( self->Params )
+		strbuilder_append_fmt( result, "%SB)", params_to_strbuilder(self->Params) );
 
 	else
-		result.append( ")" );
+		strbuilder_append_str( result, txt(")") );
 
-	if ( ast->Specs )
+	if ( self->Specs )
 	{
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ESpecifier::is_trailing( spec ) )
+			if ( spec_is_trailing( * spec ) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( " %.*s", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, " %.*s", spec_str.Len, spec_str.Ptr );
 			}
 		}
 	}
 
-	if ( ast->Specs && ast->Specs.has( ESpecifier::Pure ) >= 0 )
-		result.append( " = 0;" );
-	else if (ast->Body)
-		result.append_fmt( " = %S;", ast->Body.to_string() );
+	if ( self->Specs && specifiers_has(self->Specs, Spec_Pure ) >= 0 )
+		strbuilder_append_str( result, txt(" = 0;") );
+	else if (self->Body)
+		strbuilder_append_fmt( result, " = %SB;", body_to_strbuilder(self->Body) );
 
-	if ( ast->InlineCmt )
-		result.append_fmt( ";  %S", ast->InlineCmt->Content );
+	if ( self->InlineCmt )
+		strbuilder_append_fmt( result, ";  %S", self->InlineCmt->Content );
 	else
-		result.append( ";\n" );
+		strbuilder_append_str( result, txt(";\n") );
 }
 
-String CodeModule::to_string()
+StrBuilder module_to_strbuilder(CodeModule self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 64 );
+	module_to_strbuilder_ref( self, & result );
 	return result;
 }
 
-void CodeModule::to_string( String& result )
+void module_to_strbuilder_ref(CodeModule self, StrBuilder* result )
 {
-	if (((u32(ModuleFlag::Export) & u32(ast->ModuleFlags)) == u32(ModuleFlag::Export)))
-		result.append("export ");
+	if (((scast(u32, ModuleFlag_Export) & scast(u32, self->ModuleFlags)) == scast(u32, ModuleFlag_Export)))
+		strbuilder_append_str( result, txt("export "));
 
-	if (((u32(ModuleFlag::Import) & u32(ast->ModuleFlags)) == u32(ModuleFlag::Import)))
-		result.append("import ");
+	if (((scast(u32, ModuleFlag_Import) & scast(u32, self->ModuleFlags)) == scast(u32, ModuleFlag_Import)))
+		strbuilder_append_str( result, txt("import "));
 
-	result.append_fmt( "%S;\n", ast->Name );
+	strbuilder_append_fmt( result, "%S;\n", self->Name );
 }
 
-String CodeNS::to_string()
+StrBuilder namespace_to_strbuilder(CodeNS self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 512 );
+	namespace_to_strbuilder_ref( self, & result );
 	return result;
 }
 
-void CodeNS::to_string( String& result )
+void namespace_to_strbuilder_ref(CodeNS self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	result.append_fmt( "namespace %S\n{\n%S\n}\n", ast->Name , ast->Body.to_string() );
+	strbuilder_append_fmt( result, "namespace %S\n{\n%SB\n}\n", self->Name, body_to_strbuilder(self->Body) );
 }
 
-String CodeOperator::to_string()
+StrBuilder code_op_to_strbuilder(CodeOperator self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	switch ( ast->Type )
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 512 );
+	switch ( self->Type )
 	{
-		using namespace ECode;
-		case Operator:
-		case Operator_Member:
-			to_string_def( result );
+		case CT_Operator:
+		case CT_Operator_Member:
+			code_op_to_strbuilder_def( self, & result );
 		break;
-		case Operator_Fwd:
-		case Operator_Member_Fwd:
-			to_string_fwd( result );
+		case CT_Operator_Fwd:
+		case CT_Operator_Member_Fwd:
+			code_op_to_strbuilder_fwd( self, & result );
 		break;
 	}
 	return result;
 }
 
-void CodeOperator::to_string_def( String& result )
+void code_op_to_strbuilder_def(CodeOperator self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	if ( ast->Attributes )
-		result.append_fmt( "%S ", ast->Attributes.to_string() );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 
-	if ( ast->Attributes )
-		result.append_fmt( "%S ", ast->Attributes.to_string() );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 
-	if ( ast->Specs )
+	if ( self->Specs )
 	{
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ! ESpecifier::is_trailing( spec ) )
+			if ( ! spec_is_trailing( * spec ) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( " %.*s", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, " %.*s", spec_str.Len, spec_str.Ptr );
 			}
 		}
 	}
 
-	if ( ast->Attributes || ast->Specs )
+	if ( self->Attributes || self->Specs )
 	{
-		result.append("\n" );
+		strbuilder_append_str( result, txt("\n") );
 	}
 
-	if ( ast->ReturnType )
-		result.append_fmt( "%S %S (", ast->ReturnType.to_string(), ast->Name );
+	if ( self->ReturnType )
+		strbuilder_append_fmt( result, "%SB %S (", typename_to_strbuilder(self->ReturnType), self->Name );
 
-	if ( ast->Params )
-		result.append_fmt( "%S)", ast->Params.to_string() );
+	if ( self->Params )
+		strbuilder_append_fmt( result, "%SB)", params_to_strbuilder(self->Params) );
 
 	else
-		result.append( ")" );
+		strbuilder_append_str( result, txt(")") );
 
-	if ( ast->Specs )
+	if ( self->Specs )
 	{
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ESpecifier::is_trailing( spec ) )
+			if ( spec_is_trailing( * spec ) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( " %.*s", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, " %.*s", spec_str.Len, spec_str.Ptr );
 			}
 		}
 	}
 
-	result.append_fmt( "\n{\n%S\n}\n"
-		, ast->Body.to_string()
+	strbuilder_append_fmt( result, "\n{\n%SB\n}\n"
+		, body_to_strbuilder(self->Body)
 	);
 }
 
-void CodeOperator::to_string_fwd( String& result )
+void code_op_to_strbuilder_fwd(CodeOperator self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	if ( ast->Attributes )
-		result.append_fmt( "%S\n", ast->Attributes.to_string() );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "%SB\n", attributes_to_strbuilder(self->Attributes) );
 
-	if ( ast->Specs )
+	if ( self->Specs )
 	{
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ! ESpecifier::is_trailing( spec ) )
+			if ( ! spec_is_trailing( * spec ) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( " %.*s", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, " %.*s", spec_str.Len, spec_str.Ptr );
 			}
 		}
 	}
 
-	if ( ast->Attributes || ast->Specs )
+	if ( self->Attributes || self->Specs )
 	{
-		result.append("\n" );
+		strbuilder_append_str( result, txt("\n") );
 	}
 
-	result.append_fmt( "%S %S (", ast->ReturnType.to_string(), ast->Name );
+	strbuilder_append_fmt( result, "%SB %S (", typename_to_strbuilder(self->ReturnType), self->Name );
 
-	if ( ast->Params )
-		result.append_fmt( "%S)", ast->Params.to_string() );
+	if ( self->Params )
+		strbuilder_append_fmt( result, "%SB)", params_to_strbuilder(self->Params) );
 
 	else
-		result.append_fmt( ")" );
+		strbuilder_append_fmt( result, ")" );
 
-	if ( ast->Specs )
+	if ( self->Specs )
 	{
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ESpecifier::is_trailing( spec ) )
+			if ( spec_is_trailing( * spec ) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( " %.*s", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, " %.*s", spec_str.Len, spec_str.Ptr );
 			}
 		}
 	}
 
-	if ( ast->InlineCmt )
-		result.append_fmt( ";  %S", ast->InlineCmt->Content );
+	if ( self->InlineCmt )
+		strbuilder_append_fmt( result, ";  %S", self->InlineCmt->Content );
 	else
-		result.append( ";\n" );
+		strbuilder_append_str( result, txt(";\n") );
 }
 
-String CodeOpCast::to_string()
+StrBuilder opcast_to_strbuilder(CodeOpCast self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	switch ( ast->Type )
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 128 );
+	switch ( self->Type )
 	{
-		using namespace ECode;
-		case Operator_Cast:
-			to_string_def( result );
+		case CT_Operator_Cast:
+			opcast_to_strbuilder_def(self, & result );
 		break;
-		case Operator_Cast_Fwd:
-			to_string_fwd( result );
+		case CT_Operator_Cast_Fwd:
+			opcast_to_strbuilder_fwd(self, & result );
 		break;
 	}
 	return result;
 }
 
-void CodeOpCast::to_string_def( String& result )
+void opcast_to_strbuilder_def(CodeOpCast self, StrBuilder* result )
 {
-	if ( ast->Specs )
+	if ( self->Specs )
 	{
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ! ESpecifier::is_trailing( spec ) )
+			if ( ! spec_is_trailing( * spec ) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( "%*s ", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, "%*s ", spec_str.Len, spec_str.Ptr );
 			}
 		}
 
-		if ( ast->Name && ast->Name.length() )
-			result.append_fmt( "%Soperator %S()", ast->Name, ast->ValueType.to_string() );
+		if ( self->Name.Ptr && self->Name.Len )
+			strbuilder_append_fmt( result, "%S operator %SB()", self->Name, typename_to_strbuilder(self->ValueType) );
 		else
-			result.append_fmt( "operator %S()", ast->ValueType.to_string() );
+			strbuilder_append_fmt( result, "operator %SB()", typename_to_strbuilder(self->ValueType) );
 
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ESpecifier::is_trailing( spec ) )
+			if ( spec_is_trailing( * spec ) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( " %.*s", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, " %.*s", spec_str.Len, spec_str.Ptr );
 			}
 		}
 
-		result.append_fmt( "\n{\n%S\n}\n", ast->Body.to_string() );
+		strbuilder_append_fmt( result, "\n{\n%SB\n}\n", body_to_strbuilder(self->Body) );
 		return;
 	}
 
-	if ( ast->Name && ast->Name.length() )
-		result.append_fmt("%Soperator %S()\n{\n%S\n}\n", ast->Name, ast->ValueType.to_string(), ast->Body.to_string() );
+	if ( self->Name.Ptr && self->Name.Len )
+		strbuilder_append_fmt( result, "%S operator %SB()\n{\n%SB\n}\n", self->Name, typename_to_strbuilder(self->ValueType), body_to_strbuilder(self->Body) );
 	else
-		result.append_fmt("operator %S()\n{\n%S\n}\n", ast->ValueType.to_string(), ast->Body.to_string() );
+		strbuilder_append_fmt( result, "operator %SB()\n{\n%SB\n}\n", typename_to_strbuilder(self->ValueType), body_to_strbuilder(self->Body) );
 }
 
-void CodeOpCast::to_string_fwd( String& result )
+void opcast_to_strbuilder_fwd(CodeOpCast self, StrBuilder* result )
 {
-	if ( ast->Specs )
+	if ( self->Specs )
 	{
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ! ESpecifier::is_trailing( spec ) )
+			if ( ! spec_is_trailing( * spec ) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( "%*s ", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, "%*s ", spec_str.Len, spec_str.Ptr );
 			}
 		}
 
-		result.append_fmt( "operator %S()", ast->ValueType.to_string() );
+		strbuilder_append_fmt( result, "operator %SB()", typename_to_strbuilder(self->ValueType) );
 
-		for ( SpecifierT spec : ast->Specs )
+		for ( Specifier* spec = begin_CodeSpecifiers(self->Specs); spec != end_CodeSpecifiers(self->Specs); spec = next_CodeSpecifiers(self->Specs, spec) )
 		{
-			if ( ESpecifier::is_trailing( spec ) )
+			if ( spec_is_trailing( * spec ) )
 			{
-				StrC spec_str = ESpecifier::to_str( spec );
-				result.append_fmt( " %*s", spec_str.Len, spec_str.Ptr );
+				Str spec_str = spec_to_str( * spec );
+				strbuilder_append_fmt( result, " %*s", spec_str.Len, spec_str.Ptr );
 			}
 		}
 
-		if ( ast->InlineCmt )
-			result.append_fmt( ";  %S", ast->InlineCmt->Content );
+		if ( self->InlineCmt )
+			strbuilder_append_fmt( result, ";  %S", self->InlineCmt->Content );
 		else
-			result.append( ";\n" );
+			strbuilder_append_str( result, txt(";\n") );
 		return;
 	}
 
-	if ( ast->InlineCmt )
-		result.append_fmt("operator %S();  %S", ast->ValueType.to_string() );
+	if ( self->InlineCmt )
+		strbuilder_append_fmt( result, "operator %SB();  %SB", typename_to_strbuilder(self->ValueType) );
 	else
-		result.append_fmt("operator %S();\n", ast->ValueType.to_string() );
+		strbuilder_append_fmt( result, "operator %SB();\n", typename_to_strbuilder(self->ValueType) );
 }
 
-String CodeParam::to_string()
+StrBuilder params_to_strbuilder(CodeParams self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
+	GEN_ASSERT(self);
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 128 );
+	params_to_strbuilder_ref( self, & result );
 	return result;
 }
 
-void CodeParam::to_string( String& result )
+void params_to_strbuilder_ref( CodeParams self, StrBuilder* result )
 {
-	if ( ast->Macro )
+	GEN_ASSERT(self);
+	GEN_ASSERT(result);
+	if ( self->Macro )
 	{
 		// Related to parsing: ( <macro>, ... )
-		result.append( ast->Macro.ast->Content );
+		strbuilder_append_str( result, self->Macro->Content );
 		// Could also be: ( <macro> <type <name>, ... )
 	}
 
-	if ( ast->Name )
+	if ( self->Name.Ptr && self->Name.Len )
 	{
-		if ( ast->ValueType.ast == nullptr )
-			result.append_fmt( " %S", ast->Name );
+		if ( self->ValueType == nullptr )
+			strbuilder_append_fmt( result, " %S", self->Name );
 		else
-			result.append_fmt( " %S %S", ast->ValueType.to_string(), ast->Name );
+			strbuilder_append_fmt( result, " %SB %S", typename_to_strbuilder(self->ValueType), self->Name );
 
 	}
-	else if ( ast->ValueType )
-		result.append_fmt( " %S", ast->ValueType.to_string() );
+	else if ( self->ValueType )
+		strbuilder_append_fmt( result, " %SB", typename_to_strbuilder(self->ValueType) );
 
-	if ( ast->PostNameMacro )
+	if ( self->PostNameMacro )
 	{
-		result.append_fmt(" %S", ast->PostNameMacro.to_string() );
+		strbuilder_append_fmt( result, " %SB", code_to_strbuilder(self->PostNameMacro) );
 	}
 
-	if ( ast->Value )
-		result.append_fmt( " = %S", ast->Value.to_string() );
+	if ( self->Value )
+		strbuilder_append_fmt( result, " = %SB", code_to_strbuilder(self->Value) );
 
-	if ( ast->NumEntries - 1 > 0 )
+	if ( self->NumEntries - 1 > 0 )
 	{
-		for ( CodeParam param : ast->Next )
+		for ( CodeParams param = begin_CodeParams(self->Next); param != end_CodeParams(self->Next); param = next_CodeParams(self->Next, param) )
 		{
-			result.append_fmt( ", %S", param.to_string() );
+			strbuilder_append_fmt( result, ", %SB", params_to_strbuilder(param) );
 		}
 	}
 }
 
-String CodePreprocessCond::to_string()
+StrBuilder preprocess_to_strbuilder(CodePreprocessCond self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	switch ( ast->Type )
+	GEN_ASSERT(self);
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 256 );
+	switch ( self->Type )
 	{
-		using namespace ECode;
-		case Preprocess_If:
-			to_string_if( result );
+		case CT_Preprocess_If:
+			preprocess_to_strbuilder_if( self, & result );
 		break;
-		case Preprocess_IfDef:
-			to_string_ifdef( result );
+		case CT_Preprocess_IfDef:
+			preprocess_to_strbuilder_ifdef( self, & result );
 		break;
-		case Preprocess_IfNotDef:
-			to_string_ifndef( result );
+		case CT_Preprocess_IfNotDef:
+			preprocess_to_strbuilder_ifndef( self, & result );
 		break;
-		case Preprocess_ElIf:
-			to_string_elif( result );
+		case CT_Preprocess_ElIf:
+			preprocess_to_strbuilder_elif( self, & result );
 		break;
-		case Preprocess_Else:
-			to_string_else( result );
+		case CT_Preprocess_Else:
+			preprocess_to_strbuilder_else( self, & result );
 		break;
-		case Preprocess_EndIf:
-			to_string_endif( result );
+		case CT_Preprocess_EndIf:
+			preprocess_to_strbuilder_endif( self, & result );
 		break;
 	}
 	return result;
 }
 
-void CodePreprocessCond::to_string_if( String& result )
+void preprocess_to_strbuilder_if(CodePreprocessCond cond, StrBuilder* result )
 {
-	result.append_fmt( "#if %S\n", ast->Content );
+	GEN_ASSERT(cond);
+	strbuilder_append_fmt( result, "#if %S", cond->Content );
 }
 
-void CodePreprocessCond::to_string_ifdef( String& result )
+void preprocess_to_strbuilder_ifdef(CodePreprocessCond cond, StrBuilder* result )
 {
-	result.append_fmt( "#ifdef %S\n", ast->Content );
+	GEN_ASSERT(cond);
+	strbuilder_append_fmt( result, "#ifdef %S\n", cond->Content );
 }
 
-void CodePreprocessCond::to_string_ifndef( String& result )
+void preprocess_to_strbuilder_ifndef(CodePreprocessCond cond, StrBuilder* result )
 {
-	result.append_fmt( "#ifndef %S\n", ast->Content );
+	GEN_ASSERT(cond);
+	strbuilder_append_fmt( result, "#ifndef %S", cond->Content );
 }
 
-void CodePreprocessCond::to_string_elif( String& result )
+void preprocess_to_strbuilder_elif(CodePreprocessCond cond, StrBuilder* result )
 {
-	result.append_fmt( "#elif %S\n", ast->Content );
+	GEN_ASSERT(cond);
+	strbuilder_append_fmt( result, "#elif %S\n", cond->Content );
 }
 
-void CodePreprocessCond::to_string_else( String& result )
+void preprocess_to_strbuilder_else(CodePreprocessCond cond, StrBuilder* result )
 {
-	result.append_fmt( "#else\n" );
+	GEN_ASSERT(cond);
+	strbuilder_append_str( result, txt("#else\n") );
 }
 
-void CodePreprocessCond::to_string_endif( String& result )
+void preprocess_to_strbuilder_endif(CodePreprocessCond cond, StrBuilder* result )
 {
-	result.append_fmt( "#endif\n" );
+	GEN_ASSERT(cond);
+	strbuilder_append_str( result, txt("#endif\n") );
 }
 
-String CodePragma::to_string()
+StrBuilder pragma_to_strbuilder(CodePragma self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
+	GEN_ASSERT(self);
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 256 );
+	pragma_to_strbuilder_ref( self, & result );
 	return result;
 }
 
-void CodePragma::to_string( String& result )
+void pragma_to_strbuilder_ref(CodePragma self, StrBuilder* result )
 {
-	result.append_fmt( "#pragma %S\n", ast->Content );
+	strbuilder_append_fmt( result, "#pragma %S\n", self->Content );
 }
 
-String CodeSpecifiers::to_string()
+StrBuilder specifiers_to_strbuilder(CodeSpecifiers self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 64 );
+	specifiers_to_strbuilder_ref( self, & result );
 	return result;
 }
 
-void CodeSpecifiers::to_string( String& result )
+void specifiers_to_strbuilder_ref( CodeSpecifiers self, StrBuilder* result )
 {
+	GEN_ASSERT(self);
+	GEN_ASSERT(result);
 	s32 idx  = 0;
-	s32 left = ast->NumEntries;
+	s32 left = self->NumEntries;
 	while ( left-- )
 	{
-		StrC spec = ESpecifier::to_str( ast->ArrSpecs[idx] );
-		result.append_fmt( "%.*s ", spec.Len, spec.Ptr );
+		Str spec = spec_to_str( self->ArrSpecs[idx] );
+		strbuilder_append_fmt( result, "%.*s ", spec.Len, spec.Ptr );
 		idx++;
 	}
 }
 
-String CodeStruct::to_string()
+StrBuilder struct_to_strbuilder(CodeStruct self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	switch ( ast->Type )
+	GEN_ASSERT(self);
+	GEN_ASSERT(self);
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 512 );
+	switch ( self->Type )
 	{
-		using namespace ECode;
-		case Struct:
-			to_string_def( result );
+		case CT_Struct:
+			struct_to_strbuilder_def( self, & result );
 		break;
-		case Struct_Fwd:
-			to_string_fwd( result );
+		case CT_Struct_Fwd:
+			struct_to_strbuilder_fwd( self, & result );
 		break;
 	}
 	return result;
 }
 
-void CodeStruct::to_string_def( String& result )
+void struct_to_strbuilder_def( CodeStruct self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	GEN_ASSERT(self);
+	GEN_ASSERT(result);
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	result.append( "struct " );
+	strbuilder_append_str( result, txt("struct ") );
 
-	if ( ast->Attributes )
+	if ( self->Attributes )
 	{
-		result.append_fmt( "%S ", ast->Attributes.to_string() );
+		strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 	}
 
-	if ( ast->ParentType )
+	if ( self->ParentType )
 	{
-		char const* access_level = to_str( ast->ParentAccess );
+		Str access_level = access_spec_to_str( self->ParentAccess );
 
-		result.append_fmt( "%S : %s %S", ast->Name, access_level, ast->ParentType.to_string() );
+		strbuilder_append_fmt( result, "%S : %S %SB", self->Name, access_level, typename_to_strbuilder(self->ParentType) );
 
-		CodeType interface = ast->ParentType->Next->cast< CodeType >();
+		CodeTypename interface = cast(CodeTypename, self->ParentType->Next);
 		if ( interface )
-			result.append( "\n" );
+			strbuilder_append_str( result, txt("\n") );
 
 		while ( interface )
 		{
-			result.append_fmt( ", %S", interface.to_string() );
-			interface = interface->Next ? interface->Next->cast< CodeType >() : CodeType { nullptr };
+			strbuilder_append_fmt( result, ", %SB", typename_to_strbuilder(interface) );
+			interface = interface->Next ? cast( CodeTypename, interface->Next) : NullCode;
 		}
 	}
-	else if ( ast->Name )
+	else if ( self->Name.Len )
 	{
-		result.append( ast->Name );
+		strbuilder_append_str( result, self->Name );
 	}
 
-	if ( ast->InlineCmt )
+	if ( self->InlineCmt )
 	{
-		result.append_fmt( " // %S", ast->InlineCmt->Content );
+		strbuilder_append_fmt( result, " // %S", self->InlineCmt->Content );
 	}
 
-	result.append_fmt( "\n{\n%S\n}", ast->Body.to_string() );
+	strbuilder_append_fmt( result, "\n{\n%SB\n}", body_to_strbuilder(self->Body) );
 
-	if ( ast->Parent.ast == nullptr || ( ast->Parent->Type != ECode::Typedef && ast->Parent->Type != ECode::Variable ) )
-		result.append(";\n");
+	if ( self->Parent == nullptr || ( self->Parent->Type != CT_Typedef && self->Parent->Type != CT_Variable ) )
+		strbuilder_append_str( result, txt(";\n"));
 }
 
-void CodeStruct::to_string_fwd( String& result )
+void struct_to_strbuilder_fwd( CodeStruct self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	GEN_ASSERT(self);
+	GEN_ASSERT(result);
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	if ( ast->Attributes )
-		result.append_fmt( "struct %S %S", ast->Attributes.to_string(), ast->Name );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "struct %SB %S", attributes_to_strbuilder(self->Attributes), self->Name );
 
-	else result.append_fmt( "struct %S", ast->Name );
+	else strbuilder_append_fmt( result, "struct %S", self->Name );
 
-	if ( ast->Parent.ast == nullptr || ( ast->Parent->Type != ECode::Typedef && ast->Parent->Type != ECode::Variable ) )
+	if ( self->Parent == nullptr || ( self->Parent->Type != CT_Typedef && self->Parent->Type != CT_Variable ) )
 	{
-		if ( ast->InlineCmt )
-			result.append_fmt(";  %S", ast->InlineCmt->Content );
+		if ( self->InlineCmt )
+			strbuilder_append_fmt( result, ";  %S", self->InlineCmt->Content );
 		else
-			result.append(";\n");
+			strbuilder_append_str( result, txt( ";\n") );
 	}
 }
 
-String CodeTemplate::to_string()
+StrBuilder template_to_strbuilder(CodeTemplate self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
+	GEN_ASSERT(self);
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 1024 );
+	template_to_strbuilder_ref( self, & result );
 	return result;
 }
 
-void CodeTemplate::to_string( String& result )
+void template_to_strbuilder_ref(CodeTemplate self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	GEN_ASSERT(self);
+	GEN_ASSERT(result);
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	if ( ast->Params )
-		result.append_fmt( "template< %S >\n%S", ast->Params.to_string(), ast->Declaration.to_string() );
+	if ( self->Params )
+		strbuilder_append_fmt( result, "template< %SB >\n%SB", params_to_strbuilder(self->Params), code_to_strbuilder(self->Declaration) );
 	else
-		result.append_fmt( "template<>\n%S", ast->Declaration.to_string() );
+		strbuilder_append_fmt( result, "template<>\n%SB", code_to_strbuilder(self->Declaration) );
 }
 
-String CodeTypedef::to_string()
+StrBuilder typedef_to_strbuilder(CodeTypedef self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 128 );
+	typedef_to_strbuilder_ref( self, & result );
 	return result;
 }
 
-void CodeTypedef::to_string( String& result )
+void typedef_to_strbuilder_ref(CodeTypedef self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	result.append( "typedef ");
+	strbuilder_append_str( result, txt("typedef "));
 
 	// Determines if the typedef is a function typename
-	if ( ast->UnderlyingType->ReturnType )
-		result.append( ast->UnderlyingType.to_string() );
+	if ( self->UnderlyingType->ReturnType )
+		strbuilder_append_string( result, code_to_strbuilder(self->UnderlyingType) );
 	else
-		result.append_fmt( "%S %S", ast->UnderlyingType.to_string(), ast->Name );
+		strbuilder_append_fmt( result, "%SB %S", code_to_strbuilder(self->UnderlyingType), self->Name );
 
-	if ( ast->UnderlyingType->Type == ECode::Typename && ast->UnderlyingType->ArrExpr )
+	if ( self->UnderlyingType->Type == CT_Typename && self->UnderlyingType->ArrExpr )
 	{
-		result.append_fmt( "[ %S ];", ast->UnderlyingType->ArrExpr->to_string() );
+		strbuilder_append_fmt( result, "[ %SB ];", code_to_strbuilder(self->UnderlyingType->ArrExpr) );
 
-		AST* next_arr_expr = ast->UnderlyingType->ArrExpr->Next;
+		Code next_arr_expr = self->UnderlyingType->ArrExpr->Next;
 		while ( next_arr_expr )
 		{
-			result.append_fmt( "[ %S ];", next_arr_expr->to_string() );
+			strbuilder_append_fmt( result, "[ %SB ];", code_to_strbuilder(next_arr_expr) );
 			next_arr_expr = next_arr_expr->Next;
 		}
 	}
 	else
 	{
-		result.append( ";" );
+		strbuilder_append_str( result, txt(";") );
 	}
 
-	if ( ast->InlineCmt )
-		result.append_fmt("  %S", ast->InlineCmt->Content);
+	if ( self->InlineCmt )
+		strbuilder_append_fmt( result, "  %S", self->InlineCmt->Content);
 	else
-		result.append("\n");
+		strbuilder_append_str( result, txt("\n"));
 }
 
-String CodeType::to_string()
+StrBuilder typename_to_strbuilder(CodeTypename self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
+	StrBuilder result = strbuilder_make_str( _ctx->Allocator_Temp, txt("") );
+	typename_to_strbuilder_ref( self, & result );
 	return result;
 }
 
-void CodeType::to_string( String& result )
+void typename_to_strbuilder_ref(CodeTypename self, StrBuilder* result )
 {
 	#if defined(GEN_USE_NEW_TYPENAME_PARSING)
-		if ( ast->ReturnType && ast->Params )
+		if ( self->ReturnType && self->Params )
 		{
-			if ( ast->Attributes )
-				result.append_fmt( "%S ", ast->Attributes.to_string() );
+			if ( self->Attributes )
+				strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 			else
 			{
-				if ( ast->Specs )
-					result.append_fmt( "%S ( %S ) ( %S ) %S", ast->ReturnType.to_string(), ast->Name, ast->Params.to_string(), ast->Specs.to_string() );
+				if ( self->Specs )
+					strbuilder_append_fmt( result, "%SB ( %S ) ( %SB ) %SB", typename_to_strbuilder(self->ReturnType), self->Name, params_to_strbuilder(self->Params), specifiers_to_strbuilder(self->Specs) );
 				else
-					result.append_fmt( "%S ( %S ) ( %S )", ast->ReturnType.to_string(), ast->Name, ast->Params.to_string() );
+					strbuilder_append_fmt( result, "%SB ( %S ) ( %SB )", typename_to_strbuilder(self->ReturnType), self->Name, params_to_strbuilder(self->Params) );
 			}
 
 			break;
 		}
 	#else
-		if ( ast->ReturnType && ast->Params )
+		if ( self->ReturnType && self->Params )
 		{
-			if ( ast->Attributes )
-				result.append_fmt( "%S ", ast->Attributes.to_string() );
+			if ( self->Attributes )
+				strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 			else
 			{
-				if ( ast->Specs )
-					result.append_fmt( "%S %S ( %S ) %S", ast->ReturnType.to_string(), ast->Name, ast->Params.to_string(), ast->Specs.to_string() );
+				if ( self->Specs )
+					strbuilder_append_fmt( result, "%SB %S ( %SB ) %SB", typename_to_strbuilder(self->ReturnType), self->Name, params_to_strbuilder(self->Params), specifiers_to_strbuilder(self->Specs) );
 				else
-					result.append_fmt( "%S %S ( %S )", ast->ReturnType.to_string(), ast->Name, ast->Params.to_string() );
+					strbuilder_append_fmt( result, "%SB %S ( %SB )", typename_to_strbuilder(self->ReturnType), self->Name, params_to_strbuilder(self->Params) );
 			}
 
 			return;
 		}
 	#endif
 
-	if ( ast->Attributes )
-		result.append_fmt( "%S ", ast->Attributes.to_string() );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 
-	if ( ast->Specs )
-		result.append_fmt( "%S %S", ast->Name, ast->Specs.to_string() );
+	switch ( self->TypeTag )
+	{
+		case Tag_Class  : strbuilder_append_str( result, txt("class "));  break;
+		case Tag_Enum   : strbuilder_append_str( result, txt("enum "));   break;
+		case Tag_Struct : strbuilder_append_str( result, txt("struct ")); break;
+		case Tag_Union  : strbuilder_append_str( result, txt("union "));  break;
+		default:
+			break;
+	}
+
+	if ( self->Specs )
+		strbuilder_append_fmt( result, "%S %SB", self->Name, specifiers_to_strbuilder(self->Specs) );
 	else
-		result.append_fmt( "%S", ast->Name );
+		strbuilder_append_fmt( result, "%S", self->Name );
 
-	if ( ast->IsParamPack )
-		result.append("...");
+	if ( self->IsParamPack )
+		strbuilder_append_str( result, txt("..."));
 }
 
-String CodeUnion::to_string()
+StrBuilder union_to_strbuilder(CodeUnion self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 512 );
+	switch ( self->Type )
+	{
+		case CT_Union:
+			union_to_strbuilder_def( self, & result );
+		break;
+		case CT_Union_Fwd:
+			union_to_strbuilder_fwd( self, & result );
+		break;
+	}
 	return result;
 }
 
-void CodeUnion::to_string( String& result )
+void union_to_strbuilder_def(CodeUnion self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	result.append( "union " );
+	strbuilder_append_str( result, txt("union ") );
 
-	if ( ast->Attributes )
-		result.append_fmt( "%S ", ast->Attributes.to_string() );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 
-	if ( ast->Name )
+	if ( self->Name.Len )
 	{
-		result.append_fmt( "%S\n{\n%S\n}"
-			, ast->Name
-			, ast->Body.to_string()
+		strbuilder_append_fmt( result, "%S\n{\n%SB\n}"
+			, self->Name
+			, body_to_strbuilder(self->Body)
 		);
 	}
 	else
 	{
 		// Anonymous union
-		result.append_fmt( "\n{\n%S\n}"
-			, ast->Body.to_string()
+		strbuilder_append_fmt( result, "\n{\n%SB\n}"
+			, body_to_strbuilder(self->Body)
 		);
 	}
 
-	if ( ast->Parent.ast == nullptr || ( ast->Parent->Type != ECode::Typedef && ast->Parent->Type != ECode::Variable ) )
-		result.append(";\n");
+	if ( self->Parent == nullptr || ( self->Parent->Type != CT_Typedef && self->Parent->Type != CT_Variable ) )
+		strbuilder_append_str( result, txt(";\n"));
 }
 
-String CodeUsing::to_string()
+void union_to_strbuilder_fwd(CodeUnion self, StrBuilder* result )
 {
-	String result = String::make( GlobalAllocator, "" );
-	switch ( ast->Type )
+	GEN_ASSERT(self);
+	GEN_ASSERT(result);
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
+
+	strbuilder_append_str( result, txt("union ") );
+
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
+
+	if ( self->Name.Len )
 	{
-		using namespace ECode;
-		case Using:
-			to_string( result );
+		strbuilder_append_fmt( result, "%S", self->Name);
+	}
+
+	if ( self->Parent == nullptr || ( self->Parent->Type != CT_Typedef && self->Parent->Type != CT_Variable ) )
+		strbuilder_append_str( result, txt(";\n"));
+}
+
+StrBuilder using_to_strbuilder(CodeUsing self)
+{
+	GEN_ASSERT(self);
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 128 );
+	switch ( self->Type )
+	{
+		case CT_Using:
+			using_to_strbuilder_ref( self, & result );
 		break;
-		case Using_Namespace:
-			to_string_ns( result );
+		case CT_Using_Namespace:
+			using_to_strbuilder_ns( self, & result );
 		break;
 	}
 	return result;
 }
 
-void CodeUsing::to_string( String& result )
+void using_to_strbuilder_ref(CodeUsing self, StrBuilder* result )
 {
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	GEN_ASSERT(self);
+	GEN_ASSERT(result);
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	if ( ast->Attributes )
-		result.append_fmt( "%S ", ast->Attributes.to_string() );
+	if ( self->Attributes )
+		strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 
-	if ( ast->UnderlyingType )
+	if ( self->UnderlyingType )
 	{
-		result.append_fmt( "using %S = %S", ast->Name, ast->UnderlyingType.to_string() );
+		strbuilder_append_fmt( result, "using %S = %SB", self->Name, typename_to_strbuilder(self->UnderlyingType) );
 
-		if ( ast->UnderlyingType->ArrExpr )
+		if ( self->UnderlyingType->ArrExpr )
 		{
-			result.append_fmt( "[ %S ]", ast->UnderlyingType->ArrExpr.to_string() );
+			strbuilder_append_fmt( result, "[ %SB ]", code_to_strbuilder(self->UnderlyingType->ArrExpr) );
 
-			AST* next_arr_expr = ast->UnderlyingType->ArrExpr->Next;
+			Code next_arr_expr = self->UnderlyingType->ArrExpr->Next;
 			while ( next_arr_expr )
 			{
-				result.append_fmt( "[ %S ]", next_arr_expr->to_string() );
+				strbuilder_append_fmt( result, "[ %SB ]", code_to_strbuilder(next_arr_expr) );
 				next_arr_expr = next_arr_expr->Next;
 			}
 		}
 
-		result.append( ";" );
+		strbuilder_append_str( result, txt(";") );
 	}
 	else
-		result.append_fmt( "using %S;", ast->Name );
+		strbuilder_append_fmt( result, "using %S;", self->Name );
 
-	if ( ast->InlineCmt )
-		result.append_fmt("  %S\n", ast->InlineCmt->Content );
+	if ( self->InlineCmt )
+		strbuilder_append_fmt( result, "  %S\n", self->InlineCmt->Content );
 	else
-		result.append("\n");
+		strbuilder_append_str( result, txt("\n"));
 }
 
-void CodeUsing::to_string_ns( String& result )
+inline
+void using_to_strbuilder_ns(CodeUsing self, StrBuilder* result )
 {
-	if ( ast->InlineCmt )
-		result.append_fmt( "using namespace $S;  %S", ast->Name, ast->InlineCmt->Content );
+	GEN_ASSERT(self);
+	GEN_ASSERT(result);
+	if ( self->InlineCmt )
+		strbuilder_append_fmt( result, "using namespace $SC;  %S", self->Name, self->InlineCmt->Content );
 	else
-		result.append_fmt( "using namespace %s;\n", ast->Name );
+		strbuilder_append_fmt( result, "using namespace %S;\n", self->Name );
 }
 
-String CodeVar::to_string()
+inline
+StrBuilder var_to_strbuilder(CodeVar self)
 {
-	String result = String::make( GlobalAllocator, "" );
-	to_string( result );
+	GEN_ASSERT(self);
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, 256 );
+	var_to_strbuilder_ref( self, & result );
 	return result;
 }
 
-void CodeVar::to_string( String& result )
+neverinline
+void var_to_strbuilder_ref(CodeVar self, StrBuilder* result )
 {
-	if ( ast->Parent && ast->Parent->Type == ECode::Variable )
+	GEN_ASSERT(self);
+	GEN_ASSERT(result);
+	if ( self->Parent && self->Parent->Type == CT_Variable )
 	{
 		// Its a comma-separated variable ( a NextVar )
 
-		if ( ast->Specs )
-			result.append_fmt( "%S ", ast->Specs.to_string() );
+		if ( self->Specs )
+			strbuilder_append_fmt( result, "%SB ", specifiers_to_strbuilder(self->Specs) );
 
-		result.append( ast->Name );
+		strbuilder_append_str( result, self->Name );
 
-		if ( ast->ValueType->ArrExpr )
+		if ( self->ValueType && self->ValueType->ArrExpr )
 		{
-			result.append_fmt( "[ %S ]", ast->ValueType->ArrExpr.to_string() );
+			strbuilder_append_fmt( result, "[ %SB ]", code_to_strbuilder(self->ValueType->ArrExpr) );
 
-			AST* next_arr_expr = ast->ValueType->ArrExpr->Next;
+			Code next_arr_expr = self->ValueType->ArrExpr->Next;
 			while ( next_arr_expr )
 			{
-				result.append_fmt( "[ %S ]", next_arr_expr->to_string() );
+				strbuilder_append_fmt( result, "[ %SB ]", code_to_strbuilder(next_arr_expr) );
 				next_arr_expr = next_arr_expr->Next;
 			}
 		}
 
-		if ( ast->Value )
+		if ( self->Value )
 		{
-			if ( ast->VarConstructorInit )
-				result.append_fmt( "( %S ", ast->Value.to_string() );
+			if ( self->VarParenthesizedInit )
+				strbuilder_append_fmt( result, "( %SB ", code_to_strbuilder(self->Value) );
 			else
-				result.append_fmt( " = %S", ast->Value.to_string() );
+				strbuilder_append_fmt( result, " = %SB", code_to_strbuilder(self->Value) );
 		}
 
 		// Keep the chain going...
-		if ( ast->NextVar )
-			result.append_fmt( ", %S", ast->NextVar.to_string() );
+		if ( self->NextVar )
+			strbuilder_append_fmt( result, ", %SB", var_to_strbuilder(self->NextVar) );
 
-		if ( ast->VarConstructorInit )
-			result.append( " )");
+		if ( self->VarParenthesizedInit )
+			strbuilder_append_str( result, txt(" )"));
 
 		return;
 	}
 
-	if ( bitfield_is_equal( u32, ast->ModuleFlags, ModuleFlag::Export ))
-		result.append( "export " );
+	if ( bitfield_is_set( u32, self->ModuleFlags, ModuleFlag_Export ))
+		strbuilder_append_str( result, txt("export ") );
 
-	if ( ast->Attributes || ast->Specs )
+	if ( self->Attributes || self->Specs )
 	{
-		if ( ast->Attributes )
-			result.append_fmt( "%S ", ast->Specs.to_string() );
+		if ( self->Attributes )
+			strbuilder_append_fmt( result, "%SB ", attributes_to_strbuilder(self->Attributes) );
 
-		if ( ast->Specs )
-			result.append_fmt( "%S\n", ast->Specs.to_string() );
+		if ( self->Specs )
+			strbuilder_append_fmt( result, "%SB\n", specifiers_to_strbuilder(self->Specs) );
 
-		result.append_fmt( "%S %S", ast->ValueType.to_string(), ast->Name );
+		strbuilder_append_fmt( result, "%SB %S", typename_to_strbuilder(self->ValueType), self->Name );
 
-		if ( ast->ValueType->ArrExpr )
+		if ( self->ValueType && self->ValueType->ArrExpr )
 		{
-			result.append_fmt( "[ %S ]", ast->ValueType->ArrExpr.to_string() );
+			strbuilder_append_fmt( result, "[ %SB ]", code_to_strbuilder(self->ValueType->ArrExpr) );
 
-			AST* next_arr_expr = ast->ValueType->ArrExpr->Next;
+			Code next_arr_expr = self->ValueType->ArrExpr->Next;
 			while ( next_arr_expr )
 			{
-				result.append_fmt( "[ %S ]", next_arr_expr->to_string() );
+				strbuilder_append_fmt( result, "[ %SB ]", code_to_strbuilder(next_arr_expr) );
 				next_arr_expr = next_arr_expr->Next;
 			}
 		}
 
-		if ( ast->BitfieldSize )
-			result.append_fmt( " : %S", ast->BitfieldSize.to_string() );
+		if ( self->BitfieldSize )
+			strbuilder_append_fmt( result, " : %SB", code_to_strbuilder(self->BitfieldSize) );
 
-		if ( ast->Value )
+		if ( self->Value )
 		{
-			if ( ast->VarConstructorInit )
-				result.append_fmt( "( %S ", ast->Value.to_string() );
+			if ( self->VarParenthesizedInit )
+				strbuilder_append_fmt( result, "( %SB ", code_to_strbuilder(self->Value) );
 			else
-				result.append_fmt( " = %S", ast->Value.to_string() );
+				strbuilder_append_fmt( result, " = %SB", code_to_strbuilder(self->Value) );
 		}
 
-		if ( ast->NextVar )
-			result.append_fmt( ", %S", ast->NextVar.to_string() );
+		if ( self->NextVar )
+			strbuilder_append_fmt( result, ", %SB", var_to_strbuilder(self->NextVar) );
 
-		if ( ast->VarConstructorInit )
-			result.append( " )");
+		if ( self->VarParenthesizedInit )
+			strbuilder_append_str( result, txt(" )"));
 
-		if ( ast->InlineCmt )
-			result.append_fmt(";  %S", ast->InlineCmt->Content);
+		if ( self->InlineCmt )
+			strbuilder_append_fmt( result, ";  %S", self->InlineCmt->Content);
 		else
-			result.append( ";\n" );
+			strbuilder_append_str( result, txt(";\n") );
 
 		return;
 	}
 
-	if ( ast->BitfieldSize )
-		result.append_fmt( "%S %S : %S", ast->ValueType.to_string(), ast->Name, ast->BitfieldSize.to_string() );
+	if ( self->BitfieldSize )
+		strbuilder_append_fmt( result, "%SB %S : %SB", typename_to_strbuilder(self->ValueType), self->Name, code_to_strbuilder(self->BitfieldSize) );
 
-	else if ( ast->ValueType->ArrExpr )
+	else if ( self->ValueType && self->ValueType->ArrExpr )
 	{
-		result.append_fmt( "%S %S[ %S ]", ast->ValueType.to_string(), ast->Name, ast->ValueType->ArrExpr.to_string() );
+		strbuilder_append_fmt( result, "%SB %S[ %SB ]", typename_to_strbuilder(self->ValueType), self->Name, code_to_strbuilder(self->ValueType->ArrExpr) );
 
-		AST* next_arr_expr = ast->ValueType->ArrExpr->Next;
+		Code next_arr_expr = self->ValueType->ArrExpr->Next;
 		while ( next_arr_expr )
 		{
-			result.append_fmt( "[ %S ]", next_arr_expr->to_string() );
+			strbuilder_append_fmt( result, "[ %SB ]", code_to_strbuilder(next_arr_expr) );
 			next_arr_expr = next_arr_expr->Next;
 		}
 	}
 
 	else
-		result.append_fmt( "%S %S", ast->ValueType.to_string(), ast->Name );
+		strbuilder_append_fmt( result, "%SB %S", typename_to_strbuilder(self->ValueType), self->Name );
 
-	if ( ast->Value )
+	if ( self->Value )
 	{
-		if ( ast->VarConstructorInit )
-			result.append_fmt( "( %S ", ast->Value.to_string() );
+		if ( self->VarParenthesizedInit )
+			strbuilder_append_fmt( result, "( %SB ", code_to_strbuilder(self->Value) );
 		else
-			result.append_fmt( " = %S", ast->Value.to_string() );
+			strbuilder_append_fmt( result, " = %SB", code_to_strbuilder(self->Value) );
 	}
 
-	if ( ast->NextVar )
-		result.append_fmt( ", %S", ast->NextVar.to_string() );
+	if ( self->NextVar )
+		strbuilder_append_fmt( result, ", %SB", var_to_strbuilder( self->NextVar) );
 
-	if ( ast->VarConstructorInit )
-		result.append( " )");
+	if ( self->VarParenthesizedInit )
+		strbuilder_append_str( result, txt(" )"));
 
-	result.append( ";" );
+	strbuilder_append_str( result, txt(";") );
 
-	if ( ast->InlineCmt )
-		result.append_fmt("  %S", ast->InlineCmt->Content);
+	if ( self->InlineCmt )
+		strbuilder_append_fmt( result, "  %S", self->InlineCmt->Content);
 	else
-		result.append("\n");
+		strbuilder_append_str( result, txt("\n"));
 }
 
 #pragma endregion AST
 
 #pragma region Interface
 
-namespace parser {
-internal void init();
-internal void deinit();
-}
+internal void parser_init();
+internal void parser_deinit();
 
 internal
-void* Global_Allocator_Proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags )
+void* fallback_allocator_proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags )
 {
-	Arena* last = & Global_AllocatorBuckets.back();
+	GEN_ASSERT(_ctx);
+	GEN_ASSERT(_ctx->Fallback_AllocatorBuckets);
+	Arena* last = array_back(_ctx->Fallback_AllocatorBuckets);
 
 	switch ( type )
 	{
@@ -2864,18 +3044,18 @@ void* Global_Allocator_Proc( void* allocator_data, AllocType type, ssize size, s
 		{
 			if ( ( last->TotalUsed + size ) > last->TotalSize )
 			{
-				Arena bucket = Arena::init_from_allocator( heap(), Global_BucketSize );
+				Arena bucket = arena_init_from_allocator( heap(), _ctx->InitSize_Fallback_Allocator_Bucket_Size );
 
 				if ( bucket.PhysicalStart == nullptr )
-					GEN_FATAL( "Failed to create bucket for Global_AllocatorBuckets");
+					GEN_FATAL( "Failed to create bucket for Fallback_AllocatorBuckets");
 
-				if ( ! Global_AllocatorBuckets.append( bucket ) )
-					GEN_FATAL( "Failed to append bucket to Global_AllocatorBuckets");
+				if ( ! array_append( _ctx->Fallback_AllocatorBuckets, bucket ) )
+					GEN_FATAL( "Failed to append bucket to Fallback_AllocatorBuckets");
 
-				last = & Global_AllocatorBuckets.back();
+				last = array_back(_ctx->Fallback_AllocatorBuckets);
 			}
 
-			return alloc_align( * last, size, alignment );
+			return alloc_align( arena_allocator_info(last), size, alignment );
 		}
 		case EAllocation_FREE:
 		{
@@ -2891,15 +3071,15 @@ void* Global_Allocator_Proc( void* allocator_data, AllocType type, ssize size, s
 		{
 			if ( last->TotalUsed + size > last->TotalSize )
 			{
-				Arena bucket = Arena::init_from_allocator( heap(), Global_BucketSize );
+				Arena bucket = arena_init_from_allocator( heap(), _ctx->InitSize_Fallback_Allocator_Bucket_Size );
 
 				if ( bucket.PhysicalStart == nullptr )
-					GEN_FATAL( "Failed to create bucket for Global_AllocatorBuckets");
+					GEN_FATAL( "Failed to create bucket for Fallback_AllocatorBuckets");
 
-				if ( ! Global_AllocatorBuckets.append( bucket ) )
-					GEN_FATAL( "Failed to append bucket to Global_AllocatorBuckets");
+				if ( ! array_append( _ctx->Fallback_AllocatorBuckets, bucket ) )
+					GEN_FATAL( "Failed to append bucket to Fallback_AllocatorBuckets");
 
-				last = & Global_AllocatorBuckets.back();
+				last = array_back( _ctx->Fallback_AllocatorBuckets);
 			}
 
 			void* result = alloc_align( last->Backing, size, alignment );
@@ -2919,451 +3099,502 @@ void* Global_Allocator_Proc( void* allocator_data, AllocType type, ssize size, s
 internal
 void define_constants()
 {
-	Code::Global          = make_code();
-	Code::Global->Name    = get_cached_string( txt("Global Code") );
-	Code::Global->Content = Code::Global->Name;
+	// We only initalize these if there is no base context.
+	if ( context_counter > 0 )
+		return;
 
-	Code::Invalid = make_code();
-	Code::Invalid.set_global();
+	Code_Global          = make_code();
+	Code_Global->Name    = cache_str( txt("Global Code") );
+	Code_Global->Content = Code_Global->Name;
 
-	t_empty          = (CodeType) make_code();
-	t_empty->Type    = ECode::Typename;
-	t_empty->Name    = get_cached_string( txt("") );
-	t_empty.set_global();
+	Code_Invalid = make_code();
+	code_set_global(Code_Invalid);
+
+	t_empty       = (CodeTypename) make_code();
+	t_empty->Type = CT_Typename;
+	t_empty->Name = cache_str( txt("") );
+	code_set_global(cast(Code, t_empty));
 
 	access_private       = make_code();
-	access_private->Type = ECode::Access_Private;
-	access_private->Name = get_cached_string( txt("private:\n") );
-	access_private.set_global();
+	access_private->Type = CT_Access_Private;
+	access_private->Name = cache_str( txt("private:\n") );
+	code_set_global(cast(Code, access_private));
 
 	access_protected       = make_code();
-	access_protected->Type = ECode::Access_Protected;
-	access_protected->Name = get_cached_string( txt("protected:\n") );
-	access_protected.set_global();
+	access_protected->Type = CT_Access_Protected;
+	access_protected->Name = cache_str( txt("protected:\n") );
+	code_set_global(access_protected);
 
 	access_public       = make_code();
-	access_public->Type = ECode::Access_Public;
-	access_public->Name = get_cached_string( txt("public:\n") );
-	access_public.set_global();
+	access_public->Type = CT_Access_Public;
+	access_public->Name = cache_str( txt("public:\n") );
+	code_set_global(access_public);
 
-	attrib_api_export = def_attributes( code(GEN_API_Export_Code));
-	attrib_api_export.set_global();
+	Str api_export_str = code(GEN_API_Export_Code);
+	attrib_api_export = def_attributes( api_export_str );
+	code_set_global(cast(Code, attrib_api_export));
 
-	attrib_api_import = def_attributes( code(GEN_API_Import_Code));
-	attrib_api_import.set_global();
+	Str api_import_str = code(GEN_API_Import_Code);
+	attrib_api_import = def_attributes( api_import_str );
+	code_set_global(cast(Code, attrib_api_import));
 
 	module_global_fragment          = make_code();
-	module_global_fragment->Type    = ECode::Untyped;
-	module_global_fragment->Name    = get_cached_string( txt("module;") );
+	module_global_fragment->Type    = CT_Untyped;
+	module_global_fragment->Name    = cache_str( txt("module;") );
 	module_global_fragment->Content = module_global_fragment->Name;
-	module_global_fragment.set_global();
+	code_set_global(cast(Code, module_global_fragment));
 
 	module_private_fragment          = make_code();
-	module_private_fragment->Type    = ECode::Untyped;
-	module_private_fragment->Name    = get_cached_string( txt("module : private;") );
+	module_private_fragment->Type    = CT_Untyped;
+	module_private_fragment->Name    = cache_str( txt("module : private;") );
 	module_private_fragment->Content = module_private_fragment->Name;
-	module_private_fragment.set_global();
+	code_set_global(cast(Code, module_private_fragment));
 
 	fmt_newline = make_code();
-	fmt_newline->Type = ECode::NewLine;
-	fmt_newline.set_global();
+	fmt_newline->Type = CT_NewLine;
+	code_set_global((Code)fmt_newline);
 
 	pragma_once          = (CodePragma) make_code();
-	pragma_once->Type    = ECode::Preprocess_Pragma;
-	pragma_once->Name    = get_cached_string( txt("once") );
+	pragma_once->Type    = CT_Preprocess_Pragma;
+	pragma_once->Name    = cache_str( txt("once") );
 	pragma_once->Content = pragma_once->Name;
-	pragma_once.set_global();
+	code_set_global((Code)pragma_once);
 
-	param_varadic            = (CodeType) make_code();
-	param_varadic->Type      = ECode::Parameters;
-	param_varadic->Name      = get_cached_string( txt("...") );
+	param_varadic            = (CodeParams) make_code();
+	param_varadic->Type      = CT_Parameters;
+	param_varadic->Name      = cache_str( txt("...") );
 	param_varadic->ValueType = t_empty;
-	param_varadic.set_global();
+	code_set_global((Code)param_varadic);
 
 	preprocess_else = (CodePreprocessCond) make_code();
-	preprocess_else->Type = ECode::Preprocess_Else;
-	preprocess_else.set_global();
+	preprocess_else->Type = CT_Preprocess_Else;
+	code_set_global((Code)preprocess_else);
 
 	preprocess_endif = (CodePreprocessCond) make_code();
-	preprocess_endif->Type = ECode::Preprocess_EndIf;
-	preprocess_endif.set_global();
+	preprocess_endif->Type = CT_Preprocess_EndIf;
+	code_set_global((Code)preprocess_endif);
 
-#	define def_constant_code_type( Type_ )   \
-		t_##Type_ = def_type( name(Type_) ); \
-		t_##Type_.set_global();
-
-	def_constant_code_type( auto );
-	def_constant_code_type( void );
-	def_constant_code_type( int );
-	def_constant_code_type( bool );
-	def_constant_code_type( char );
-	def_constant_code_type( wchar_t );
-	def_constant_code_type( class );
-	def_constant_code_type( typename );
+	Str auto_str     = txt("auto");     t_auto     = def_type( auto_str );     code_set_global( t_auto );
+	Str void_str     = txt("void");     t_void     = def_type( void_str );     code_set_global( t_void );
+	Str int_str      = txt("int");      t_int      = def_type( int_str );      code_set_global( t_int  );
+	Str bool_str     = txt("bool");     t_bool     = def_type( bool_str );     code_set_global( t_bool );
+	Str char_str     = txt("char");     t_char     = def_type( char_str );     code_set_global( t_char );
+	Str wchar_str    = txt("wchar_t");  t_wchar_t  = def_type( wchar_str );    code_set_global( t_wchar_t );
+	Str class_str    = txt("class");    t_class    = def_type( class_str );    code_set_global( t_class );
+	Str typename_str = txt("typename"); t_typename = def_type( typename_str ); code_set_global( t_typename );
 
 #ifdef GEN_DEFINE_LIBRARY_CODE_CONSTANTS
-	t_b32 = def_type( name(b32) );
+	t_b32 = def_type( name(b32) ); code_set_global( t_b32 );
 
-	def_constant_code_type( s8 );
-	def_constant_code_type( s16 );
-	def_constant_code_type( s32 );
-	def_constant_code_type( s64 );
+	Str s8_str  = txt("s8");  t_s8  = def_type( s8_str ); code_set_global( t_s8 );
+	Str s16_str = txt("s16"); t_s16 = def_type( s16_str ); code_set_global( t_s16 );
+	Str s32_str = txt("s32"); t_s32 = def_type( s32_str ); code_set_global( t_s32 );
+	Str s64_str = txt("s64"); t_s64 = def_type( s64_str ); code_set_global( t_s64 );
 
-	def_constant_code_type( u8 );
-	def_constant_code_type( u16 );
-	def_constant_code_type( u32 );
-	def_constant_code_type( u64 );
+	Str u8_str  = txt("u8");  t_u8  = def_type( u8_str );  code_set_global( t_u8 );
+	Str u16_str = txt("u16"); t_u16 = def_type( u16_str ); code_set_global( t_u16 );
+	Str u32_str = txt("u32"); t_u32 = def_type( u32_str ); code_set_global( t_u32 );
+	Str u64_str = txt("u64"); t_u64 = def_type( u64_str ); code_set_global( t_u64 );
 
-	def_constant_code_type( ssize );
-	def_constant_code_type( usize );
+	Str ssize_str = txt("ssize"); t_ssize = def_type( ssize_str ); code_set_global( t_ssize );
+	Str usize_str = txt("usize"); t_usize = def_type( usize_str ); code_set_global( t_usize );
 
-	def_constant_code_type( f32 );
-	def_constant_code_type( f64 );
+	Str f32_str = txt("f32"); t_f32 = def_type( f32_str ); code_set_global( t_f32 );
+	Str f64_str = txt("f64"); t_f64 = def_type( f64_str ); code_set_global( t_f64 );
 #endif
-#	undef def_constant_code_type
 
+	spec_const            = def_specifier( Spec_Const);            code_set_global( cast(Code, spec_const ));
+	spec_consteval        = def_specifier( Spec_Consteval);        code_set_global( cast(Code, spec_consteval ));
+	spec_constexpr        = def_specifier( Spec_Constexpr);        code_set_global( cast(Code, spec_constexpr ));
+	spec_constinit        = def_specifier( Spec_Constinit);        code_set_global( cast(Code, spec_constinit ));
+	spec_extern_linkage   = def_specifier( Spec_External_Linkage); code_set_global( cast(Code, spec_extern_linkage ));
+	spec_final            = def_specifier( Spec_Final);            code_set_global( cast(Code, spec_final ));
+	spec_FORCEINLINE      = def_specifier( Spec_ForceInline);      code_set_global( cast(Code, spec_FORCEINLINE ));
+	spec_global           = def_specifier( Spec_Global);           code_set_global( cast(Code, spec_global ));
+	spec_inline           = def_specifier( Spec_Inline);           code_set_global( cast(Code, spec_inline ));
+	spec_internal_linkage = def_specifier( Spec_Internal_Linkage); code_set_global( cast(Code, spec_internal_linkage ));
+	spec_local_persist    = def_specifier( Spec_Local_Persist);    code_set_global( cast(Code, spec_local_persist ));
+	spec_mutable          = def_specifier( Spec_Mutable);          code_set_global( cast(Code, spec_mutable ));
+	spec_neverinline      = def_specifier( Spec_NeverInline);      code_set_global( cast(Code, spec_neverinline ));
+	spec_noexcept         = def_specifier( Spec_NoExceptions);     code_set_global( cast(Code, spec_noexcept ));
+	spec_override         = def_specifier( Spec_Override);         code_set_global( cast(Code, spec_override ));
+	spec_ptr              = def_specifier( Spec_Ptr);              code_set_global( cast(Code, spec_ptr ));
+	spec_pure             = def_specifier( Spec_Pure);             code_set_global( cast(Code, spec_pure ));
+	spec_ref              = def_specifier( Spec_Ref);              code_set_global( cast(Code, spec_ref ));
+	spec_register         = def_specifier( Spec_Register);         code_set_global( cast(Code, spec_register ));
+	spec_rvalue           = def_specifier( Spec_RValue);           code_set_global( cast(Code, spec_rvalue ));
+	spec_static_member    = def_specifier( Spec_Static);           code_set_global( cast(Code, spec_static_member ));
+	spec_thread_local     = def_specifier( Spec_Thread_Local);     code_set_global( cast(Code, spec_thread_local ));
+	spec_virtual          = def_specifier( Spec_Virtual);          code_set_global( cast(Code, spec_virtual ));
+	spec_volatile         = def_specifier( Spec_Volatile);         code_set_global( cast(Code, spec_volatile ));
 
-#	define def_constant_spec( Type_, ... )                                  \
-		spec_##Type_ = def_specifiers( num_args(__VA_ARGS__), __VA_ARGS__); \
-		spec_##Type_.set_global();
+	spec_local_persist = def_specifiers( 1, Spec_Local_Persist );
+	code_set_global(cast(Code, spec_local_persist));
 
-#	pragma push_macro("FORCEINLINE")
-#	pragma push_macro("global")
-#	pragma push_macro("internal")
-#	pragma push_macro("local_persist")
-#	pragma push_macro("neverinline")
-#	undef FORCEINLINE
-#	undef global
-#	undef internal
-#	undef local_persist
-#	undef neverinline
-	def_constant_spec( const,            ESpecifier::Const );
-	def_constant_spec( consteval,        ESpecifier::Consteval );
-	def_constant_spec( constexpr,        ESpecifier::Constexpr );
-	def_constant_spec( constinit,        ESpecifier::Constinit );
-	def_constant_spec( extern_linkage,   ESpecifier::External_Linkage );
-	def_constant_spec( final, 		     ESpecifier::Final );
-	def_constant_spec( FORCEINLINE,      ESpecifier::ForceInline );
-	def_constant_spec( global,           ESpecifier::Global );
-	def_constant_spec( inline,           ESpecifier::Inline );
-	def_constant_spec( internal_linkage, ESpecifier::Internal_Linkage );
-	def_constant_spec( local_persist,    ESpecifier::Local_Persist );
-	def_constant_spec( mutable,          ESpecifier::Mutable );
-	def_constant_spec( neverinline,      ESpecifier::NeverInline );
-	def_constant_spec( noexcept,         ESpecifier::NoExceptions );
-	def_constant_spec( override,         ESpecifier::Override );
-	def_constant_spec( ptr,              ESpecifier::Ptr );
-	def_constant_spec( pure,             ESpecifier::Pure )
-	def_constant_spec( ref,              ESpecifier::Ref );
-	def_constant_spec( register,         ESpecifier::Register );
-	def_constant_spec( rvalue,           ESpecifier::RValue );
-	def_constant_spec( static_member,    ESpecifier::Static );
-	def_constant_spec( thread_local,     ESpecifier::Thread_Local );
-	def_constant_spec( virtual, 		 ESpecifier::Virtual );
-	def_constant_spec( volatile, 	     ESpecifier::Volatile)
-
-	spec_local_persist = def_specifiers( 1, ESpecifier::Local_Persist );
-	spec_local_persist.set_global();
-
-#	pragma pop_macro("FORCEINLINE")
-#	pragma pop_macro("global")
-#	pragma pop_macro("internal")
-#	pragma pop_macro("local_persist")
-#	pragma pop_macro("neverinline")
-
-#	undef def_constant_spec
+	if (enum_underlying_macro.Name.Len == 0) {
+		enum_underlying_macro.Name  = txt("enum_underlying");
+		enum_underlying_macro.Type  = MT_Expression;
+		enum_underlying_macro.Flags = MF_Functional;
+	}
+	register_macro(enum_underlying_macro);
 }
 
-void init()
+void init(Context* ctx)
 {
-	// Setup global allocator
-	{
-		GlobalAllocator = AllocatorInfo { & Global_Allocator_Proc, nullptr };
-
-		Global_AllocatorBuckets = Array<Arena>::init_reserve( heap(), 128 );
-
-		if ( Global_AllocatorBuckets == nullptr )
-			GEN_FATAL( "Failed to reserve memory for Global_AllocatorBuckets");
-
-		Arena bucket = Arena::init_from_allocator( heap(), Global_BucketSize );
-
-		if ( bucket.PhysicalStart == nullptr )
-			GEN_FATAL( "Failed to create first bucket for Global_AllocatorBuckets");
-
-		Global_AllocatorBuckets.append( bucket );
-
+	do_once() {
+		context_counter = 0;
 	}
+	AllocatorInfo fallback_allocator = { & fallback_allocator_proc, nullptr };
+	
+	b32 using_fallback_allocator = false;
+	if (ctx->Allocator_DyanmicContainers.Proc == nullptr) {
+		ctx->Allocator_DyanmicContainers = fallback_allocator;
+		using_fallback_allocator = true;
+	}
+	if (ctx->Allocator_Pool.Proc == nullptr ) {
+		ctx->Allocator_Pool = fallback_allocator;
+		using_fallback_allocator = true;
+	}
+	if (ctx->Allocator_StrCache.Proc == nullptr) {
+		ctx->Allocator_StrCache = fallback_allocator;
+		using_fallback_allocator = true;
+	}
+	if (ctx->Allocator_Temp.Proc == nullptr) {
+		ctx->Allocator_Temp = fallback_allocator;
+		using_fallback_allocator = true;
+	}
+	// Setup fallback allocator
+	if (using_fallback_allocator)
+	{
+		ctx->Fallback_AllocatorBuckets = array_init_reserve(Arena, heap(), 128 );
+		if ( ctx->Fallback_AllocatorBuckets == nullptr )
+			GEN_FATAL( "Failed to reserve memory for Fallback_AllocatorBuckets");
+
+		Arena bucket = arena_init_from_allocator( heap(), ctx->InitSize_Fallback_Allocator_Bucket_Size );
+		if ( bucket.PhysicalStart == nullptr )
+			GEN_FATAL( "Failed to create first bucket for Fallback_AllocatorBuckets");
+
+		array_append( ctx->Fallback_AllocatorBuckets, bucket );
+	}
+
+	if (ctx->Max_CommentLineLength == 0) {
+		ctx->Max_CommentLineLength = 1024;
+	}
+	if (ctx->Max_StrCacheLength == 0) {
+		ctx->Max_StrCacheLength = kilobytes(512);
+	}
+
+	if (ctx->InitSize_BuilderBuffer == 0) {
+		ctx->InitSize_BuilderBuffer = megabytes(2);
+	}
+	if (ctx->InitSize_CodePoolsArray == 0) { 
+		ctx->InitSize_CodePoolsArray = 16; 
+	}
+	if (ctx->InitSize_StringArenasArray == 0) {
+		ctx->InitSize_StringArenasArray = 16; 
+	}
+	if (ctx->CodePool_NumBlocks == 0) {
+		ctx->CodePool_NumBlocks = kilobytes(16);
+	}
+
+	if (ctx->InitSize_LexerTokens == 0 ) {
+		ctx->InitSize_LexerTokens = kilobytes(64);
+	}
+	if (ctx->SizePer_StringArena == 0) {
+		ctx->SizePer_StringArena = megabytes(1);
+	}
+
+	if (ctx->InitSize_Fallback_Allocator_Bucket_Size == 0) { 
+		ctx->InitSize_Fallback_Allocator_Bucket_Size = megabytes(8);
+	}
+
+	// Override the current context (user has to put it back if unwanted).
+	_ctx = ctx;
 
 	// Setup the arrays
 	{
-		CodePools = Array<Pool>::init_reserve( Allocator_DataArrays, InitSize_DataArrays );
-
-		if ( CodePools == nullptr )
+		ctx->CodePools = array_init_reserve(Pool, ctx->Allocator_DyanmicContainers, ctx->InitSize_CodePoolsArray );
+		if ( ctx->CodePools == nullptr )
 			GEN_FATAL( "gen::init: Failed to initialize the CodePools array" );
 
-		StringArenas = Array<Arena>::init_reserve( Allocator_DataArrays, InitSize_DataArrays );
-
-		if ( StringArenas == nullptr )
+		ctx->StringArenas = array_init_reserve(Arena, ctx->Allocator_DyanmicContainers, ctx->InitSize_StringArenasArray );
+		if ( ctx->StringArenas == nullptr )
 			GEN_FATAL( "gen::init: Failed to initialize the StringArenas array" );
 	}
-
 	// Setup the code pool and code entries arena.
 	{
-		Pool code_pool = Pool::init( Allocator_CodePool, CodePool_NumBlocks, sizeof(AST) );
-
+		Pool code_pool = pool_init( ctx->Allocator_Pool, ctx->CodePool_NumBlocks, sizeof(AST) );
 		if ( code_pool.PhysicalStart == nullptr )
 			GEN_FATAL( "gen::init: Failed to initialize the code pool" );
+		array_append( ctx->CodePools, code_pool );
 
-		CodePools.append( code_pool );
-
-		LexArena = Arena::init_from_allocator( Allocator_Lexer, LexAllocator_Size );
-
-		Arena string_arena = Arena::init_from_allocator( Allocator_StringArena, SizePer_StringArena );
-
-		if ( string_arena.PhysicalStart == nullptr )
+		// TODO(Ed): Eventually the string arenas needs to be phased out for a dedicated string slab allocator
+		Arena strbuilder_arena = arena_init_from_allocator( ctx->Allocator_StrCache, ctx->SizePer_StringArena );
+		if ( strbuilder_arena.PhysicalStart == nullptr )
 			GEN_FATAL( "gen::init: Failed to initialize the string arena" );
-
-		StringArenas.append( string_arena );
+		array_append( ctx->StringArenas, strbuilder_arena );
 	}
-
 	// Setup the hash tables
 	{
-		StringCache = StringTable::init( Allocator_StringTable );
-
-		if ( StringCache.Entries == nullptr )
+		ctx->StrCache = hashtable_init(StrCached, ctx->Allocator_DyanmicContainers);
+		if ( ctx->StrCache.Entries == nullptr )
 			GEN_FATAL( "gen::init: Failed to initialize the StringCache");
-	}
 
-	// Preprocessor Defines
-	PreprocessorDefines = Array<StringCached>::init_reserve( GlobalAllocator, kilobytes(1) );
+		ctx->Macros = hashtable_init(Macro, ctx->Allocator_DyanmicContainers);
+		if (ctx->Macros.Hashes == nullptr || ctx->Macros.Entries == nullptr) {
+			GEN_FATAL( "gen::init: Failed to initialize the PreprocessMacros table" );
+		}
+	}
 
 	define_constants();
-	parser::init();
+	parser_init();
+
+	++ context_counter;
 }
 
-void deinit()
+void deinit(Context* ctx)
 {
+	GEN_ASSERT(context_counter);
+	GEN_ASSERT_MSG(context_counter > 0, "Attempted to deinit a context that for some reason wan't accounted for!");
 	usize index = 0;
-	usize left  = CodePools.num();
+	usize left  = array_num(ctx->CodePools);
 	do
 	{
-		Pool* code_pool = & CodePools[index];
-		code_pool->free();
+		Pool* code_pool = & ctx->CodePools[index];
+		pool_free(code_pool);
 		index++;
 	}
 	while ( left--, left );
 
 	index = 0;
-	left  = StringArenas.num();
+	left  = array_num(ctx->StringArenas);
 	do
 	{
-		Arena* string_arena = & StringArenas[index];
-		string_arena->free();
+		Arena* strbuilder_arena = & ctx->StringArenas[index];
+		arena_free(strbuilder_arena);
 		index++;
 	}
 	while ( left--, left );
 
-	StringCache.destroy();
+	hashtable_destroy(ctx->StrCache);
 
-	CodePools.free();
-	StringArenas.free();
+	array_free( ctx->CodePools);
+	array_free( ctx->StringArenas);
 
-	LexArena.free();
+	hashtable_destroy(ctx->Macros);
 
-	PreprocessorDefines.free();
-
-	index = 0;
-	left  = Global_AllocatorBuckets.num();
-	do
+	left  = array_num( ctx->Fallback_AllocatorBuckets);
+	if (left)
 	{
-		Arena* bucket = & Global_AllocatorBuckets[ index ];
-		bucket->free();
-		index++;
+		index = 0;
+		do
+		{
+			Arena* bucket = & ctx->Fallback_AllocatorBuckets[ index ];
+			arena_free(bucket);
+			index++;
+		}
+		while ( left--, left );
+		array_free( ctx->Fallback_AllocatorBuckets);
 	}
-	while ( left--, left );
+	parser_deinit();
 
-	Global_AllocatorBuckets.free();
-	parser::deinit();
+	if (_ctx == ctx) 
+		_ctx = nullptr;
+	-- context_counter;
 }
 
-void reset()
+void reset(Context* ctx)
 {
 	s32 index = 0;
-	s32 left  = CodePools.num();
+	s32 left  = array_num(ctx->CodePools);
 	do
 	{
-		Pool* code_pool = & CodePools[index];
-		code_pool->clear();
+		Pool* code_pool = & ctx->CodePools[index];
+		pool_clear(code_pool);
 		index++;
 	}
 	while ( left--, left );
 
 	index = 0;
-	left  = StringArenas.num();
+	left  = array_num(ctx->StringArenas);
 	do
 	{
-		Arena* string_arena = & StringArenas[index];
-		string_arena->TotalUsed = 0;;
+		Arena* strbuilder_arena = & ctx->StringArenas[index];
+		strbuilder_arena->TotalUsed = 0;;
 		index++;
 	}
 	while ( left--, left );
 
-	StringCache.clear();
-
+	hashtable_clear(ctx->StrCache);
+	hashtable_clear(ctx->Macros);
 	define_constants();
 }
 
-AllocatorInfo get_string_allocator( s32 str_length )
+void set_context(Context* new_ctx) {
+	GEN_ASSERT(new_ctx);
+	_ctx = new_ctx;
+}
+
+AllocatorInfo get_cached_str_allocator( s32 str_length )
 {
-	Arena* last = & StringArenas.back();
-
-	usize size_req = str_length + sizeof(String::Header) + sizeof(char*);
-
-	if ( last->TotalUsed + ssize(size_req) > last->TotalSize )
+	Arena* last     = array_back(_ctx->StringArenas);
+	usize  size_req = str_length + sizeof(StrBuilderHeader) + sizeof(char*);
+	if ( last->TotalUsed + scast(ssize, size_req) > last->TotalSize )
 	{
-		Arena new_arena = Arena::init_from_allocator( Allocator_StringArena, SizePer_StringArena );
+		Arena new_arena = arena_init_from_allocator( _ctx->Allocator_StrCache, _ctx->SizePer_StringArena );
+		if ( ! array_append( _ctx->StringArenas, new_arena ) )
+			GEN_FATAL( "gen::get_cached_str_allocator: Failed to allocate a new string arena" );
 
-		if ( ! StringArenas.append( new_arena ) )
-			GEN_FATAL( "gen::get_string_allocator: Failed to allocate a new string arena" );
-
-		last = & StringArenas.back();
+		last = array_back( _ctx->StringArenas);
 	}
-
-	return * last;
+	return arena_allocator_info(last);
 }
 
 // Will either make or retrive a code string.
-StringCached get_cached_string( StrC str )
+StrCached cache_str( Str str )
 {
-	s32 hash_length = str.Len > kilobytes(1) ? kilobytes(1) : str.Len;
-	u64 key         = crc32( str.Ptr, hash_length );
-	{
-		StringCached* result = StringCache.get( key );
-
+	if (str.Len > _ctx->Max_StrCacheLength) {
+		// Do not cache the string, just shove into the arena and and return it.
+		Str result = strbuilder_to_str( strbuilder_make_str( get_cached_str_allocator( str.Len ), str ));
+		return result;
+	}
+	u64 key = crc32( str.Ptr, str.Len ); {
+		StrCached* result = hashtable_get( _ctx->StrCache, key );
 		if ( result )
 			return * result;
 	}
-
-	String result = String::make( get_string_allocator( str.Len ), str );
-	StringCache.set( key, result );
-
+	Str result = strbuilder_to_str( strbuilder_make_str( get_cached_str_allocator( str.Len ), str ));
+	hashtable_set( _ctx->StrCache, key, result );
 	return result;
 }
 
 // Used internally to retireve a Code object form the CodePool.
 Code make_code()
 {
-	Pool* allocator = & CodePools.back();
+	Pool* allocator = array_back( _ctx->CodePools);
 	if ( allocator->FreeList == nullptr )
 	{
-		Pool code_pool = Pool::init( Allocator_CodePool, CodePool_NumBlocks, sizeof(AST) );
+		Pool code_pool = pool_init( _ctx->Allocator_Pool, _ctx->CodePool_NumBlocks, sizeof(AST) );
 
 		if ( code_pool.PhysicalStart == nullptr )
 			GEN_FATAL( "gen::make_code: Failed to allocate a new code pool - CodePool allcoator returned nullptr." );
 
-		if ( ! CodePools.append( code_pool ) )
+		if ( ! array_append( _ctx->CodePools, code_pool ) )
 			GEN_FATAL( "gen::make_code: Failed to allocate a new code pool - CodePools failed to append new pool." );
 
-		allocator = & CodePools.back();
+		allocator = array_back( _ctx->CodePools);
 	}
-
-	Code result { rcast( AST*, alloc( * allocator, sizeof(AST) )) };
-	mem_set( result.ast, 0, sizeof(AST) );
-	// result->Type = ECode::Invalid;
-
-	// result->Content     = { nullptr };
-	// result->Prev        = { nullptr };
-	// result->Next        = { nullptr };
-	// result->Token		= nullptr;
-	// result->Parent      = { nullptr };
-	// result->Name        = { nullptr };
-	// result->Type        = ECode::Invalid;
-	// result->ModuleFlags = ModuleFlag::Invalid;
-	// result->NumEntries  = 0;
-
+	Code result = { rcast( AST*, alloc( pool_allocator_info(allocator), sizeof(AST) )) };
+	mem_set( rcast(void*, cast(AST*, result)), 0, sizeof(AST) );
 	return result;
 }
 
-void set_allocator_data_arrays( AllocatorInfo allocator )
-{
-	Allocator_DataArrays = allocator;
+Macro* lookup_macro( Str name ) {
+	u32 key = crc32( name.Ptr, name.Len );
+	return hashtable_get( _ctx->Macros, key );
 }
 
-void set_allocator_code_pool( AllocatorInfo allocator )
-{
-	Allocator_CodePool = allocator;
+void register_macro( Macro macro ) {
+	GEN_ASSERT_NOT_NULL(macro.Name.Ptr);
+	GEN_ASSERT(macro.Name.Len > 0);
+	u32 key = crc32( macro.Name.Ptr, macro.Name.Len );
+	macro.Name = cache_str(macro.Name);
+	hashtable_set( _ctx->Macros, key, macro );
 }
 
-void set_allocator_lexer( AllocatorInfo allocator )
+void register_macros( s32 num, ... )
 {
-	Allocator_Lexer = allocator;
+	GEN_ASSERT(num > 0);
+	va_list va;
+	va_start(va, num);
+	do
+	{
+		Macro macro = va_arg(va, Macro);
+		GEN_ASSERT_NOT_NULL(macro.Name.Ptr);
+		GEN_ASSERT(macro.Name.Len > 0);
+		macro.Name = cache_str(macro.Name);
+
+		u32 key = crc32( macro.Name.Ptr, macro.Name.Len );
+		hashtable_set( _ctx->Macros, key, macro );
+	}
+	while (num--, num > 0);
+	va_end(va);
 }
 
-void set_allocator_string_arena( AllocatorInfo allocator )
+void register_macros( s32 num,  Macro* macros )
 {
-	Allocator_StringArena = allocator;
-}
+	GEN_ASSERT(num > 0);
+	do
+	{
+		Macro macro = * macros;
+		GEN_ASSERT_NOT_NULL(macro.Name.Ptr);
+		GEN_ASSERT(macro.Name.Len > 0);
+		macro.Name = cache_str(macro.Name);
 
-void set_allocator_string_table( AllocatorInfo allocator )
-{
-	Allocator_StringArena = allocator;
+		u32 key = crc32( macro.Name.Ptr, macro.Name.Len );
+		hashtable_set( _ctx->Macros, key, macro );
+		++ macros;
+	}
+	while (num--, num > 0);
 }
 
 #pragma region Upfront
 
-enum class OpValidateResult : u32
+enum OpValidateResult : u32
 {
-	Fail,
-	Global,
-	Member
+	OpValResult_Fail,
+	OpValResult_Global,
+	OpValResult_Member
 };
 
-OpValidateResult operator__validate( OperatorT op, CodeParam params_code, CodeType ret_type, CodeSpecifiers specifier )
+internal neverinline
+OpValidateResult operator__validate( Operator op, CodeParams params_code, CodeTypename ret_type, CodeSpecifiers specifier )
 {
-	using namespace EOperator;
-
-	if ( op == EOperator::Invalid )
+	if ( op == Op_Invalid )
 	{
 		log_failure("gen::def_operator: op cannot be invalid");
-		return OpValidateResult::Fail;
+		return OpValResult_Fail;
 	}
 
 #pragma region Helper Macros
-#	define check_params()                                                                                 \
-	if ( ! params_code )                                                                                  \
-	{                                                                                                     \
-		log_failure("gen::def_operator: params is null and operator%s requires it", to_str(op));          \
-		return OpValidateResult::Fail;                                                                    \
-	}                                                                                                     \
-	if ( params_code->Type != ECode::Parameters )                                                         \
-	{                                                                                                     \
-		log_failure("gen::def_operator: params is not of Parameters type - %s", params_code.debug_str()); \
-		return OpValidateResult::Fail;                                                                    \
+#	define check_params()                                                                                                   \
+	if ( ! params_code )                                                                                                    \
+	{                                                                                                                       \
+		log_failure("gen::def_operator: params is null and operator %S requires it", operator_to_str(op));                  \
+		return OpValResult_Fail;                                                                                            \
+	}                                                                                                                       \
+	if ( params_code->Type != CT_Parameters )                                                                               \
+	{                                                                                                                       \
+		log_failure("gen::def_operator: params is not of Parameters type - %S", code_debug_str( cast(Code, params_code)));  \
+		return OpValResult_Fail;                                                                                            \
 	}
 
-#	define check_param_eq_ret()                                                                     \
-	if ( ! is_member_symbol && ! params_code->ValueType.is_equal( ret_type) )                       \
-	{                                                                                               \
-		log_failure("gen::def_operator: operator%s requires first parameter to equal return type\n" \
-			"param types: %s\n"                                                                     \
-			"return type: %s",                                                                      \
-			to_str(op).Ptr,                                                                         \
-			params_code.debug_str(),                                                                \
-			ret_type.debug_str()                                                                    \
-		);                                                                                          \
-		return OpValidateResult::Fail;                                                              \
+#	define check_param_eq_ret()                                                                            \
+	if ( ! is_member_symbol && ! code_is_equal(cast(Code, params_code->ValueType), cast(Code, ret_type)) ) \
+	{                                                                                                      \
+		log_failure("gen::def_operator: operator %S requires first parameter to equal return type\n"       \
+			"param types: %S\n"                                                                            \
+			"return type: %S",                                                                             \
+			operator_to_str(op),                                                                           \
+			code_debug_str(cast(Code, params_code)),                                                       \
+			code_debug_str(cast(Code, ret_type))                                                           \
+		);                                                                                                 \
+		return OpValResult_Fail;                                                                           \
 	}
 #pragma endregion Helper Macros
 
 	if ( ! ret_type )
 	{
-		log_failure("gen::def_operator: ret_type is null but is required by operator%s", to_str(op));
+		log_failure("gen::def_operator: ret_type is null but is required by operator %S", operator_to_str(op));
 	}
 
-	if ( ret_type->Type != ECode::Typename )
+	if ( ret_type->Type != CT_Typename )
 	{
-		log_failure("gen::def_operator: ret_type is not of typename type - %s", ret_type.debug_str());
-		return OpValidateResult::Fail;
+		log_failure("gen::def_operator: operator %S - ret_type is not of typename type - %S",
+			operator_to_str(op),
+			code_debug_str(cast(Code, ret_type))
+		);
+		return OpValResult_Fail;
 	}
 
 	bool is_member_symbol = false;
@@ -3371,32 +3602,32 @@ OpValidateResult operator__validate( OperatorT op, CodeParam params_code, CodeTy
 	switch ( op )
 	{
 #	define specs( ... ) num_args( __VA_ARGS__ ), __VA_ARGS__
-		case Assign:
+		case Op_Assign:
 			check_params();
 
 			if ( params_code->NumEntries > 1 )
 			{
 				log_failure("gen::def_operator: "
-					"operator%s does not support non-member definition (more than one parameter provided) - %s",
-					to_str(op),
-					params_code.debug_str()
+					"operator %S does not support non-member definition (more than one parameter provided) - %S",
+					operator_to_str(op),
+					code_debug_str(cast(Code, params_code))
 				);
-				return OpValidateResult::Fail;
+				return OpValResult_Fail;
 			}
 
 			is_member_symbol = true;
 			break;
 
-		case Assign_Add:
-		case Assign_Subtract:
-		case Assign_Multiply:
-		case Assign_Divide:
-		case Assign_Modulo:
-		case Assign_BAnd:
-		case Assign_BOr:
-		case Assign_BXOr:
-		case Assign_LShift:
-		case Assign_RShift:
+		case Op_Assign_Add:
+		case Op_Assign_Subtract:
+		case Op_Assign_Multiply:
+		case Op_Assign_Divide:
+		case Op_Assign_Modulo:
+		case Op_Assign_BAnd:
+		case Op_Assign_BOr:
+		case Op_Assign_BXOr:
+		case Op_Assign_LShift:
+		case Op_Assign_RShift:
 			check_params();
 
 			if ( params_code->NumEntries == 1 )
@@ -3407,33 +3638,33 @@ OpValidateResult operator__validate( OperatorT op, CodeParam params_code, CodeTy
 
 			if (params_code->NumEntries > 2 )
 			{
-				log_failure("gen::def_operator: operator%s may not be defined with more than two parametes - param count; %d\n%s"
-					, to_str(op)
+				log_failure("gen::def_operator: operator %S may not be defined with more than two parametes - param count; %d\n%S"
+					, operator_to_str(op)
 					, params_code->NumEntries
-					, params_code.debug_str()
+					, code_debug_str(cast(Code, params_code))
 				);
-				return OpValidateResult::Fail;
+				return OpValResult_Fail;
 			}
 			break;
 
-		case Increment:
-		case Decrement:
+		case Op_Increment:
+		case Op_Decrement:
 			// If its not set, it just means its a prefix member op.
 			if ( params_code )
 			{
-				if ( params_code->Type != ECode::Parameters )
+				if ( params_code->Type != CT_Parameters )
 				{
-					log_failure("gen::def_operator: operator%s params code provided is not of Parameters type - %s"
-						, to_str(op)
-						, params_code.debug_str()
+					log_failure("gen::def_operator: operator %S params code provided is not of Parameters type - %S"
+						, operator_to_str(op)
+						, code_debug_str(cast(Code, params_code))
 					);
-					return OpValidateResult::Fail;
+					return OpValResult_Fail;
 				}
 
 				switch ( params_code->NumEntries )
 				{
 					case 1:
-						if ( params_code->ValueType.is_equal( t_int ) )
+						if ( code_is_equal((Code)params_code->ValueType, (Code)t_int ) )
 							is_member_symbol = true;
 
 						else
@@ -3443,69 +3674,69 @@ OpValidateResult operator__validate( OperatorT op, CodeParam params_code, CodeTy
 					case 2:
 						check_param_eq_ret();
 
-						if ( ! params_code.get(1).is_equal( t_int ) )
+						if ( ! code_is_equal((Code)params_get(params_code, 1), (Code)t_int ) )
 						{
 							log_failure("gen::def_operator: "
-								"operator%s requires second parameter of non-member definition to be int for post-decrement",
-								to_str(op)
+								"operator %S requires second parameter of non-member definition to be int for post-decrement",
+								operator_to_str(op)
 							);
-							return OpValidateResult::Fail;
+							return OpValResult_Fail;
 						}
 						break;
 
 					default:
-						log_failure("gen::def_operator: operator%s recieved unexpected number of parameters recived %d instead of 0-2"
-							, to_str(op)
+						log_failure("gen::def_operator: operator %S recieved unexpected number of parameters recived %d instead of 0-2"
+							, operator_to_str(op)
 							, params_code->NumEntries
 						);
-						return OpValidateResult::Fail;
+						return OpValResult_Fail;
 				}
 			}
 			break;
 
-		case Unary_Plus:
-		case Unary_Minus:
+		case Op_Unary_Plus:
+		case Op_Unary_Minus:
 			if ( ! params_code )
 				is_member_symbol = true;
 
 			else
 			{
-				if ( params_code->Type != ECode::Parameters )
+				if ( params_code->Type != CT_Parameters )
 				{
-					log_failure("gen::def_operator: params is not of Parameters type - %s", params_code.debug_str());
-					return OpValidateResult::Fail;
+					log_failure("gen::def_operator: params is not of Parameters type - %S", code_debug_str((Code)params_code));
+					return OpValResult_Fail;
 				}
 
-				if ( params_code->ValueType.is_equal( ret_type ) )
+				if ( code_is_equal((Code)params_code->ValueType, (Code)ret_type ) )
 				{
 					log_failure("gen::def_operator: "
-						"operator%s is non-member symbol yet first paramter does not equal return type\n"
-						"param type: %s\n"
-						"return type: %s\n"
-						, params_code.debug_str()
-						, ret_type.debug_str()
+						"operator %S is non-member symbol yet first paramter does not equal return type\n"
+						"param type: %S\n"
+						"return type: %S\n"
+						, code_debug_str((Code)params_code)
+						, code_debug_str((Code)ret_type)
 					);
-					return OpValidateResult::Fail;
+					return OpValResult_Fail;
 				}
 
 				if ( params_code->NumEntries > 1 )
 				{
-					log_failure("gen::def_operator: operator%s may not have more than one parameter - param count: %d"
-						, to_str(op)
+					log_failure("gen::def_operator: operator %S may not have more than one parameter - param count: %d"
+						, operator_to_str(op)
 						, params_code->NumEntries
 					);
-					return OpValidateResult::Fail;
+					return OpValResult_Fail;
 				}
 			}
 			break;
 
-		case BNot:
+		case Op_BNot:
 		{
 			// Some compilers let you do this...
 		#if 0
 			if ( ! ret_type.is_equal( t_bool) )
 			{
-				log_failure( "gen::def_operator: return type is not a boolean - %s", params_code.debug_str() );
+				log_failure( "gen::def_operator: operator %S return type is not a boolean - %S", operator_to_str(op) code_debug_str(params_code) );
 				return OpValidateResult::Fail;
 			}
 		#endif
@@ -3515,35 +3746,35 @@ OpValidateResult operator__validate( OperatorT op, CodeParam params_code, CodeTy
 
 			else
 			{
-				if ( params_code->Type != ECode::Parameters )
+				if ( params_code->Type != CT_Parameters )
 				{
-					log_failure( "gen::def_operator: params is not of Parameters type - %s", params_code.debug_str() );
-					return OpValidateResult::Fail;
+					log_failure( "gen::def_operator: operator %S - params is not of Parameters type - %S", operator_to_str(op), code_debug_str((Code)params_code) );
+					return OpValResult_Fail;
 				}
 
 				if ( params_code->NumEntries > 1 )
 				{
 					log_failure(
-					    "gen::def_operator: operator%s may not have more than one parameter - param count: %d",
-					    to_str( op ),
-					    params_code->NumEntries
+						"gen::def_operator: operator %S may not have more than one parameter - param count: %d",
+						operator_to_str( op ),
+						params_code->NumEntries
 					);
-					return OpValidateResult::Fail;
+					return OpValResult_Fail;
 				}
 			}
 			break;
 		}
 
-		case Add:
-		case Subtract:
-		case Multiply:
-		case Divide:
-		case Modulo:
-		case BAnd:
-		case BOr:
-		case BXOr:
-		case LShift:
-		case RShift:
+		case Op_Add:
+		case Op_Subtract:
+		case Op_Multiply:
+		case Op_Divide:
+		case Op_Modulo:
+		case Op_BAnd:
+		case Op_BOr:
+		case Op_BXOr:
+		case Op_LShift:
+		case Op_RShift:
 			check_params();
 
 			switch ( params_code->NumEntries )
@@ -3553,68 +3784,69 @@ OpValidateResult operator__validate( OperatorT op, CodeParam params_code, CodeTy
 					break;
 
 				case 2:
-					if ( ! params_code->ValueType.is_equal( ret_type ) )
-					{
-						log_failure("gen::def_operator: "
-							"operator%s is non-member symbol yet first paramter does not equal return type\n"
-							"param type: %s\n"
-							"return type: %s\n"
-							, params_code.debug_str()
-							, ret_type.debug_str()
-						);
-						return OpValidateResult::Fail;
-					}
+					// This is allowed for arithemtic operators
+					// if ( ! code_is_equal((Code)params_code->ValueType, (Code)ret_type ) )
+					// {
+					// 	log_failure("gen::def_operator: "
+					// 		"operator %S is non-member symbol yet first paramter does not equal return type\n"
+					// 		"param type: %S\n"
+					// 		"return type: %S\n"
+					// 		, code_debug_str((Code)params_code)
+					// 		, code_debug_str((Code)ret_type)
+					// 	);
+					// 	return OpValResult_Fail;
+					// }
 					break;
 
 				default:
-					log_failure("gen::def_operator: operator%s recieved unexpected number of paramters recived %d instead of 0-2"
-						, to_str(op)
+					log_failure("gen::def_operator: operator %S recieved unexpected number of paramters recived %d instead of 0-2"
+						, operator_to_str(op)
 						, params_code->NumEntries
 					);
-					return OpValidateResult::Fail;
+					return OpValResult_Fail;
 			}
 			break;
 
-		case UnaryNot:
+		case Op_UnaryNot:
 			if ( ! params_code )
 				is_member_symbol = true;
 
 			else
 			{
-				if ( params_code->Type != ECode::Parameters )
+				if ( params_code->Type != CT_Parameters )
 				{
-					log_failure("gen::def_operator: params is not of Parameters type - %s", params_code.debug_str());
-					return OpValidateResult::Fail;
+					log_failure("gen::def_operator: operator %S - params is not of Parameters type - %S", operator_to_str(op), code_debug_str((Code)params_code));
+					return OpValResult_Fail;
 				}
 
 				if ( params_code->NumEntries != 1 )
 				{
-					log_failure("gen::def_operator: operator%s recieved unexpected number of paramters recived %d instead of 0-1"
-						, to_str(op)
+					log_failure("gen::def_operator: operator %S recieved unexpected number of paramters recived %d instead of 0-1"
+						, operator_to_str(op)
 						, params_code->NumEntries
 					);
-					return OpValidateResult::Fail;
+					return OpValResult_Fail;
 				}
 			}
 
-			if ( ! ret_type.is_equal( t_bool ))
+			if ( ! code_is_equal((Code)ret_type, (Code)t_bool ))
 			{
-				log_failure("gen::def_operator: operator%s return type must be of type bool - %s"
-					, to_str(op)
-					, ret_type.debug_str()
+				log_failure("gen::def_operator: operator %S return type must be of type bool - %S"
+					, operator_to_str(op)
+					, code_debug_str((Code)ret_type)
 				);
-				return OpValidateResult::Fail;
+				return OpValResult_Fail;
 			}
 			break;
 
-		case LAnd:
-		case LOr:
-		case LEqual:
-		case LNot:
-		case Lesser:
-		case Greater:
-		case LesserEqual:
-		case GreaterEqual:
+		case Op_LAnd:
+		case Op_LOr:
+		case Op_LEqual:
+		case Op_LNot:
+		case Op_Lesser:
+		case Op_Greater:
+		case Op_LesserEqual:
+		case Op_GreaterEqual:
 			check_params();
 
 			switch ( params_code->NumEntries )
@@ -3627,24 +3859,24 @@ OpValidateResult operator__validate( OperatorT op, CodeParam params_code, CodeTy
 					break;
 
 				default:
-					log_failure("gen::def_operator: operator%s recieved unexpected number of paramters recived %d instead of 1-2"
-						, to_str(op)
+					log_failure("gen::def_operator: operator %S recieved unexpected number of paramters recived %d instead of 1-2"
+						, operator_to_str(op)
 						, params_code->NumEntries
 					);
-					return OpValidateResult::Fail;
+					return OpValResult_Fail;
 			}
 			break;
 
-		case Indirection:
-		case AddressOf:
-		case MemberOfPointer:
+		case Op_Indirection:
+		case Op_AddressOf:
+		case Op_MemberOfPointer:
 			if ( params_code && params_code->NumEntries > 1)
 			{
-				log_failure("gen::def_operator: operator%s recieved unexpected number of paramters recived %d instead of 0-1"
-					, to_str(op)
+				log_failure("gen::def_operator: operator %S recieved unexpected number of paramters recived %d instead of 0-1"
+					, operator_to_str(op)
 					, params_code->NumEntries
 				);
-				return OpValidateResult::Fail;
+				return OpValResult_Fail;
 			}
 			else
 			{
@@ -3652,78 +3884,57 @@ OpValidateResult operator__validate( OperatorT op, CodeParam params_code, CodeTy
 			}
 			break;
 
-		case PtrToMemOfPtr:
+		case Op_PtrToMemOfPtr:
 			if ( params_code )
 			{
-				log_failure("gen::def_operator: operator%s expects no paramters - %s", to_str(op), params_code.debug_str());
-				return OpValidateResult::Fail;
+				log_failure("gen::def_operator: operator %S expects no paramters - %S", operator_to_str(op), code_debug_str((Code)params_code));
+				return OpValResult_Fail;
 			}
 			break;
 
-		case Subscript:
-		case FunctionCall:
-		case Comma:
+		case Op_Subscript:
+		case Op_FunctionCall:
+		case Op_Comma:
 			check_params();
 			break;
 
-		case New:
-		case Delete:
+		case Op_New:
+		case Op_Delete:
 			// This library doesn't support validating new and delete yet.
 			break;
 #	undef specs
 	}
 
-	return is_member_symbol ? OpValidateResult::Member : OpValidateResult::Global;
+	return is_member_symbol ? OpValResult_Member : OpValResult_Global;
 #	undef check_params
 #	undef check_ret_type
 #	undef check_param_eq_ret
 }
 
-
-#pragma region Helper Marcos
-// This snippet is used in nearly all the functions.
-#define name_check( Context_, Name_ )                                                                 \
-{                                                                                                     \
-	if ( Name_.Len <= 0 )                                                                             \
-	{                                                                                                 \
-		log_failure( "gen::" stringize(Context_) ": Invalid name length provided - %d",  Name_.Len ); \
-		return CodeInvalid;                                                                           \
-	}                                                                                                 \
-																									  \
-	if ( Name_.Ptr == nullptr )                                                                       \
-	{                                                                                                 \
-		log_failure( "gen::" stringize(Context_) ": name is null" );                                  \
-		return CodeInvalid;                                                                           \
-	}                                                                                                 \
-}
-
-#define null_check( Context_, Code_ )                                                         \
-	if ( ! Code_ )                                                                            \
-	{                                                                                         \
-		log_failure( "gen::" stringize(Context_) ": " stringize(Code_) " provided is null" ); \
-		return CodeInvalid;                                                                   \
+FORCEINLINE
+bool name__check( char const* context, Str name )
+{
+	if ( name.Len <= 0 ) {
+		log_failure( "gen::%s: Invalid name length provided - %d",  name.Len );
+		return false;
 	}
-
-#define null_or_invalid_check( Context_, Code_ )                                                \
-{                                                                                               \
-	if ( ! Code_ )                                                                              \
-	{                                                                                           \
-		log_failure( "gen::" stringize(Context_) ": " stringize(Code_) " provided is null" );   \
-		return CodeInvalid;                                                                     \
-	}                                                                                           \
-																								\
-	if ( Code_->is_invalid() )                                                                  \
-	{                                                                                           \
-		log_failure("gen::" stringize(Context_) ": " stringize(Code_) " provided is invalid" ); \
-		return CodeInvalid;                                                                     \
-	}                                                                                           \
+	if ( name.Ptr == nullptr ) {
+		log_failure( "gen::%s: name is null" );
+		return false;
+	}
+	return true;
 }
+#define name_check( context, name ) name__check( #context, name )
 
-#define not_implemented( Context_ )                             \
-	log_failure( "gen::%s: This function is not implemented" ); \
-	return CodeInvalid;
-#pragma endregion Helper Marcos
-
+FORCEINLINE
+bool null__check( char const* context, char const* code_id, Code code ) {
+	if ( code == nullptr ) {
+		log_failure( "gen::%s: %s provided is null", context, code_id );
+		return false;
+	}
+	return true;
+}
+#define null_check( context, code ) null__check( #context, #code, cast(Code, code) )
 
 /*
 The implementaiton of the upfront constructors involves doing three things:
@@ -3737,34 +3948,31 @@ identify the issue without having to debug too much (at least they can debug tho
 The largest of the functions is related to operator overload definitions.
 The library validates a good protion of their form and thus the argument processing for is quite a bit.
 */
-CodeAttributes def_attributes( StrC content )
+CodeAttributes def_attributes( Str content )
 {
-	if ( content.Len <= 0 || content.Ptr == nullptr )
-	{
+	if ( content.Len <= 0 || content.Ptr == nullptr ) {
 		log_failure( "gen::def_attributes: Invalid attributes provided" );
-		return CodeInvalid;
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
 	Code
 	result          = make_code();
-	result->Type    = ECode::PlatformAttributes;
-	result->Name    = get_cached_string( content );
+	result->Type    = CT_PlatformAttributes;
+	result->Name    = cache_str( content );
 	result->Content = result->Name;
-
 	return (CodeAttributes) result;
 }
 
-CodeComment def_comment( StrC content )
+CodeComment def_comment( Str content )
 {
 	if ( content.Len <= 0 || content.Ptr == nullptr )
 	{
 		log_failure( "gen::def_comment: Invalid comment provided:" );
-		return CodeInvalid;
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
 
-	static char line[ MaxCommentLineLength ];
-
-	String      cmt_formatted = String::make_reserve( GlobalAllocator, kilobytes(1) );
+	StrBuilder  cmt_formatted = strbuilder_make_reserve( _ctx->Allocator_Temp, kilobytes(1) );
 	char const* end           = content.Ptr + content.Len;
 	char const* scanner       = content.Ptr;
 	s32         curr          = 0;
@@ -3779,1062 +3987,883 @@ CodeComment def_comment( StrC content )
 		}
 		length++;
 
-		str_copy( line, scanner, length );
-		cmt_formatted.append_fmt( "//%.*s", length, line );
-		mem_set( line, 0, MaxCommentLineLength );
-
+		strbuilder_append_fmt(& cmt_formatted, "//%.*s", length, scanner );
 		scanner += length;
 	}
 	while ( scanner <= end );
 
-	if ( cmt_formatted.back() != '\n' )
-		cmt_formatted.append( "\n" );
+	if ( * strbuilder_back(cmt_formatted) != '\n' )
+		strbuilder_append_str( & cmt_formatted, txt("\n") );
+
+	Str name = strbuilder_to_str(cmt_formatted);
 
 	Code
 	result          = make_code();
-	result->Type    = ECode::Comment;
-	result->Name    = get_cached_string( cmt_formatted );
+	result->Type    = CT_Comment;
+	result->Name    = cache_str( name );
 	result->Content = result->Name;
 
-	cmt_formatted.free();
+	strbuilder_free(& cmt_formatted);
 
 	return (CodeComment) result;
 }
 
-CodeConstructor def_constructor( CodeParam params, Code initializer_list, Code body )
+CodeConstructor def_constructor( Opts_def_constructor p )
 {
-	using namespace ECode;
-
-	if ( params && params->Type != Parameters )
-	{
-		log_failure("gen::def_constructor: params must be of Parameters type - %s", params.debug_str());
-		return CodeInvalid;
+	if ( p.params && p.params->Type != CT_Parameters ) {
+		log_failure("gen::def_constructor: params must be of Parameters type - %s", code_debug_str((Code)p.params));
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
 
-	CodeConstructor
-	result = (CodeConstructor) make_code();
-
-	if ( params )
-	{
-		result->Params = params;
+	CodeConstructor result = (CodeConstructor) make_code();
+	if ( p.params ) {
+		result->Params = p.params;
 	}
-
-	if ( initializer_list )
-	{
-		result->InitializerList = initializer_list;
+	if ( p.initializer_list ) {
+		result->InitializerList = p.initializer_list;
 	}
-
-	if ( body )
+	if ( p.body )
 	{
-		switch ( body->Type )
-		{
-			case Function_Body:
-			case Untyped:
+		switch ( p.body->Type ) {
+			case CT_Function_Body:
+			case CT_Untyped:
 			break;
 
 			default:
-				log_failure("gen::def_constructor: body must be either of Function_Body or Untyped type - %s", body.debug_str());
-				return CodeInvalid;
+				log_failure("gen::def_constructor: body must be either of Function_Body or Untyped type - %s", code_debug_str(p.body));
+				return InvalidCode;
 		}
 
-		result->Type = Constructor;
-		result->Body = body;
+		result->Type = CT_Constructor;
+		result->Body = p.body;
 	}
 	else
 	{
-		result->Type = Constructor_Fwd;
+		result->Type = CT_Constructor_Fwd;
 	}
-
 	return result;
 }
 
-CodeClass def_class( StrC name
-	, Code           body
-	, CodeType       parent, AccessSpec parent_access
-	, CodeAttributes attributes
-	, ModuleFlag     mflags
-	, CodeType*      interfaces, s32 num_interfaces	)
+CodeClass def_class( Str name, Opts_def_struct p )
 {
-	using namespace ECode;
-
-	name_check( def_class, name );
-
-	if ( attributes && attributes->Type != PlatformAttributes )
-	{
-		log_failure( "gen::def_class: attributes was not a 'PlatformAttributes' type: %s", attributes.debug_str() );
-		return CodeInvalid;
+	if ( ! name_check( def_class, name ) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( parent && ( parent->Type != Class && parent->Type != Struct && parent->Type != Typename && parent->Type != Untyped ) )
-	{
-		log_failure( "gen::def_class: parent provided is not type 'Class', 'Struct', 'Typeanme', or 'Untyped': %s", parent.debug_str() );
-		return CodeInvalid;
+	if ( p.attributes && p.attributes->Type != CT_PlatformAttributes ) {
+		log_failure( "gen::def_class: attributes was not a 'PlatformAttributes' type: %s", code_debug_str(p.attributes) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	if ( p.parent && ( p.parent->Type != CT_Class && p.parent->Type != CT_Struct && p.parent->Type != CT_Typename && p.parent->Type != CT_Untyped ) ) {
+		log_failure( "gen::def_class: parent provided is not type 'Class', 'Struct', 'Typeanme', or 'Untyped': %s", code_debug_str(p.parent) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
 
 	CodeClass
-	result              = (CodeClass) make_code();
-	result->Name        = get_cached_string( name );
-	result->ModuleFlags = mflags;
-
-	if ( body )
+	result               = (CodeClass) make_code();
+	result->Name         = cache_str( name );
+	result->ModuleFlags  = p.mflags;
+	result->Attributes   = p.attributes;
+	result->ParentAccess = p.parent_access;
+	result->ParentType   = p.parent;
+	if ( p.body )
 	{
-		switch ( body->Type )
+		switch ( p.body->Type )
 		{
-			case Class_Body:
-			case Untyped:
+			case CT_Class_Body:
+			case CT_Untyped:
 			break;
 
 			default:
-				log_failure("gen::def_class: body must be either of Class_Body or Untyped type - %s", body.debug_str());
-				return CodeInvalid;
+				log_failure("gen::def_class: body must be either of Class_Body or Untyped type - %s", code_debug_str(p.body));
+				return InvalidCode;
 		}
 
-		result->Type = Class;
-		result->Body = body;
-		result->Body->Parent = result; // TODO(Ed): Review this?
+		result->Type         = CT_Class;
+		result->Body         = p.body;
+		result->Body->Parent = cast(Code, result);
 	}
-	else
-	{
-		result->Type = Class_Fwd;
+	else {
+		result->Type = CT_Class_Fwd;
 	}
-
-	if ( attributes )
-		result->Attributes = attributes;
-
-	if ( parent )
-	{
-		result->ParentAccess = parent_access;
-		result->ParentType   = parent;
+	for (s32 idx = 0; idx < p.num_interfaces; idx++ ) {
+		class_add_interface(result, p.interfaces[idx] );
 	}
-
-	if ( interfaces )
-	{
-		for (s32 idx = 0; idx < num_interfaces; idx++ )
-		{
-			result.add_interface( interfaces[idx] );
-		}
-	}
-
 	return result;
 }
 
-CodeDefine def_define( StrC name, StrC content )
+CodeDefine def_define( Str name, MacroType type, Opts_def_define p )
 {
-	using namespace ECode;
-
-	name_check( def_define, name );
-
-	// Defines can be empty definitions
-#if 0
-	if ( content.Len <= 0 || content.Ptr == nullptr )
-	{
-		log_failure( "gen::def_define: Invalid value provided" );
-		return CodeInvalid;
+	if ( ! name_check( def_define, name ) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-#endif
-
 	CodeDefine
 	result          = (CodeDefine) make_code();
-	result->Type    = Preprocess_Define;
-	result->Name    = get_cached_string( name );
-	if ( content.Len <= 0 || content.Ptr == nullptr )
-	{
-		result->Content = get_cached_string( txt("") );
-	}
+	result->Type    = CT_Preprocess_Define;
+	result->Name    = cache_str( name );
+	result->Params  = p.params;
+	if ( p.content.Len <= 0 || p.content.Ptr == nullptr )
+		result->Body = untyped_str( txt("\n") );
 	else
-		result->Content = get_cached_string( content );
+		result->Body = untyped_str( strbuilder_to_str(strbuilder_fmt_buf(_ctx->Allocator_Temp, "%S\n", p.content)) );
 
+	b32  register_define = ! p.dont_register_to_preprocess_macros;
+	if ( register_define ) {
+		Macro macro_entry = { result->Name, type, p.flags };
+		register_macro(macro_entry);
+	}
 	return result;
 }
 
-CodeDestructor def_destructor( Code body, CodeSpecifiers specifiers )
+CodeDestructor def_destructor( Opts_def_destructor p )
 {
-	using namespace ECode;
-
-	if ( specifiers && specifiers->Type != Specifiers )
-	{
-		log_failure( "gen::def_destructor: specifiers was not a 'Specifiers' type: %s", specifiers.debug_str() );
-		return CodeInvalid;
+	if ( p.specifiers && p.specifiers->Type != CT_Specifiers ) {
+		log_failure( "gen::def_destructor: specifiers was not a 'Specifiers' type: %s", code_debug_str(p.specifiers) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
 
-	CodeDestructor result = (CodeDestructor) make_code();
-
-	if ( specifiers )
-		result->Specs = specifiers;
-
-	if ( body )
+	CodeDestructor
+	result        = (CodeDestructor) make_code();
+	result->Specs = p.specifiers;
+	if ( p.body )
 	{
-		switch ( body->Type )
+		switch ( p.body->Type )
 		{
-			case Function_Body:
-			case Untyped:
+			case CT_Function_Body:
+			case CT_Untyped:
 			break;
 
 			default:
-				log_failure("gen::def_destructor: body must be either of Function_Body or Untyped type - %s", body.debug_str());
-				return CodeInvalid;
+				log_failure("gen::def_destructor: body must be either of Function_Body or Untyped type - %s", code_debug_str(p.body));
+				return InvalidCode;
 		}
 
-		result->Type = Destructor;
-		result->Body = body;
+		result->Type = CT_Destructor;
+		result->Body = p.body;
 	}
 	else
 	{
-		result->Type = Destructor_Fwd;
+		result->Type = CT_Destructor_Fwd;
 	}
-
 	return result;
 }
 
-CodeEnum def_enum( StrC name
-	, Code       body,      CodeType       type
-	, EnumT      specifier, CodeAttributes attributes
-	, ModuleFlag mflags )
+CodeEnum def_enum( Str name, Opts_def_enum p )
 {
-	using namespace ECode;
-
-	name_check( def_enum, name );
-
-	if ( type && type->Type != Typename )
-	{
-		log_failure( "gen::def_enum: enum underlying type provided was not of type Typename: %s", type.debug_str() );
-		return CodeInvalid;
+	if ( ! name_check( def_enum, name ) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( attributes && attributes->Type != PlatformAttributes )
-	{
-		log_failure( "gen::def_enum: attributes was not a 'PlatformAttributes' type: %s", attributes.debug_str() );
-		return CodeInvalid;
+	if ( p.type && p.type->Type != CT_Typename ) {
+		log_failure( "gen::def_enum: enum underlying type provided was not of type Typename: %s", code_debug_str(p.type) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	if ( p.attributes && p.attributes->Type != CT_PlatformAttributes ) {
+		log_failure( "gen::def_enum: attributes was not a 'PlatformAttributes' type: %s", code_debug_str(p.attributes) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
 
 	CodeEnum
 	result              = (CodeEnum) make_code();
-	result->Name        = get_cached_string( name );
-	result->ModuleFlags = mflags;
-
-	if ( body )
+	result->Name        = cache_str( name );
+	result->ModuleFlags = p.mflags;
+	if ( p.body )
 	{
-		switch ( body->Type )
+		switch ( p.body->Type )
 		{
-			case Enum_Body:
-			case Untyped:
+			case CT_Enum_Body:
+			case CT_Untyped:
 			break;
 
 			default:
-				log_failure( "gen::def_enum: body must be of Enum_Body or Untyped type %s", body.debug_str());
-				return CodeInvalid;
+				log_failure( "gen::def_enum: body must be of Enum_Body or Untyped type %s", code_debug_str(p.body));
+				return InvalidCode;
 		}
 
-		result->Type = specifier == EnumClass ?
-			Enum_Class : Enum;
+		result->Type = p.specifier == EnumDecl_Class ?
+			CT_Enum_Class : CT_Enum;
 
-		result->Body = body;
+		result->Body = p.body;
 	}
 	else
 	{
-		result->Type = specifier == EnumClass ?
-			Enum_Class_Fwd : Enum_Fwd;
+		result->Type = p.specifier == EnumDecl_Class ?
+			CT_Enum_Class_Fwd : CT_Enum_Fwd;
 	}
+	result->Attributes = p.attributes;
 
-	if ( attributes )
-		result->Attributes = attributes;
-
-	if ( type )
-	{
-		result->UnderlyingType = type;
+	if ( p.type ) {
+		result->UnderlyingType = p.type;
 	}
-	else if ( result->Type != Enum_Class_Fwd && result->Type != Enum_Fwd )
+	else if ( p.type_macro ) {
+		result->UnderlyingTypeMacro = p.type_macro;
+	}
+	else if ( result->Type != CT_Enum_Class_Fwd && result->Type != CT_Enum_Fwd )
 	{
 		log_failure( "gen::def_enum: enum forward declaration must have an underlying type" );
-		return CodeInvalid;
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
 	return result;
 }
 
-CodeExec def_execution( StrC content )
+CodeExec def_execution( Str content )
 {
-	if ( content.Len <= 0 || content.Ptr == nullptr )
-	{
+	if ( content.Len <= 0 || content.Ptr == nullptr ) {
 		log_failure( "gen::def_execution: Invalid execution provided" );
-		return CodeInvalid;
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	Code
-	result          = make_code();
-	result->Type    = ECode::Execution;
-	result->Name    = get_cached_string( content );
-	result->Content = result->Name;
-
-	return (CodeExec) result;
+	CodeExec
+	result          = (CodeExec) make_code();
+	result->Type    = CT_Execution;
+	result->Content = cache_str( content );
+	return result;
 }
 
-CodeExtern def_extern_link( StrC name, Code body )
+CodeExtern def_extern_link( Str name, CodeBody body )
 {
-	using namespace ECode;
-
-	name_check( def_extern_linkage, name );
-	null_check( def_extern_linkage, body );
-
-	if ( body->Type != Extern_Linkage_Body && body->Type != Untyped )
-	{
-		log_failure("gen::def_extern_linkage: body is not of extern_linkage or untyped type %s", body->debug_str());
-		return CodeInvalid;
+	if ( ! name_check(def_extern_link, name) || ! null_check(def_extern_link, body) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	if ( body->Type != CT_Extern_Linkage_Body && body->Type != CT_Untyped ) {
+		log_failure("gen::def_extern_linkage: body is not of extern_linkage or untyped type %s", code_debug_str(body));
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
 	CodeExtern
 	result        = (CodeExtern)make_code();
-	result->Type  = Extern_Linkage;
-	result->Name  = get_cached_string( name );
+	result->Type  = CT_Extern_Linkage;
+	result->Name  = cache_str( name );
 	result->Body  = body;
-
-	return (CodeExtern) result;
+	return result;
 }
 
 CodeFriend def_friend( Code declaration )
 {
-	using namespace ECode;
-
-	null_check( def_friend, declaration );
-
+	if ( ! null_check( def_friend, declaration ) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
 	switch ( declaration->Type )
 	{
-		case Class_Fwd:
-		case Function_Fwd:
-		case Operator_Fwd:
-		case Struct_Fwd:
-		case Class:
-		case Function:
-		case Operator:
-		case Struct:
+		case CT_Class_Fwd:
+		case CT_Function_Fwd:
+		case CT_Operator_Fwd:
+		case CT_Struct_Fwd:
+		case CT_Class:
+		case CT_Function:
+		case CT_Operator:
+		case CT_Struct:
 		break;
 
 		default:
-			log_failure("gen::def_friend: requires declartion to have class, function, operator, or struct - %s", declaration->debug_str());
-			return CodeInvalid;
+			log_failure("gen::def_friend: requires declartion to have class, function, operator, or struct - %s", code_debug_str(declaration));
+			return InvalidCode;
 	}
-
 	CodeFriend
-	result       = (CodeFriend) make_code();
-	result->Type = Friend;
-
+	result              = (CodeFriend) make_code();
+	result->Type        = CT_Friend;
 	result->Declaration = declaration;
-
 	return result;
 }
 
-CodeFn def_function( StrC name
-	, CodeParam      params ,    CodeType       ret_type, Code body
-	, CodeSpecifiers specifiers, CodeAttributes attributes
-	, ModuleFlag     mflags )
+CodeFn def_function( Str name, Opts_def_function p )
 {
-	using namespace ECode;
-
-	name_check( def_function, name );
-
-	if ( params && params->Type != Parameters )
-	{
-		log_failure( "gen::def_function: params was not a `Parameters` type: %s", params.debug_str() );
-		return CodeInvalid;
+	if ( ! name_check( def_function, name )) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( ret_type && ret_type->Type != Typename )
-	{
-		log_failure( "gen::def_function: ret_type was not a Typename: %s", ret_type.debug_str() );
-		return CodeInvalid;
+	if ( p.params && p.params->Type != CT_Parameters ) {
+		log_failure( "gen::def_function: params was not a `Parameters` type: %s", code_debug_str(p.params) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( specifiers && specifiers->Type != Specifiers )
-	{
-		log_failure( "gen::def_function: specifiers was not a `Specifiers` type: %s", specifiers.debug_str() );
-		return CodeInvalid;
+	if ( p.ret_type && p.ret_type->Type != CT_Typename ) {
+		log_failure( "gen::def_function: ret_type was not a Typename: %s", code_debug_str(p.ret_type) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( attributes && attributes->Type != PlatformAttributes )
-	{
-		log_failure( "gen::def_function: attributes was not a `PlatformAttributes` type: %s", attributes.debug_str() );
-		return CodeInvalid;
+	if ( p.specs && p.specs-> Type != CT_Specifiers ) {
+		log_failure( "gen::def_function: specifiers was not a `Specifiers` type: %s", code_debug_str(p.specs) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	if ( p.attrs && p.attrs->Type != CT_PlatformAttributes ) {
+		log_failure( "gen::def_function: attributes was not a `PlatformAttributes` type: %s", code_debug_str(p.attrs) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
 
 	CodeFn
 	result              = (CodeFn) make_code();
-	result->Name        = get_cached_string( name );
-	result->ModuleFlags = mflags;
-
-	if ( body )
+	result->Name        = cache_str( name );
+	result->ModuleFlags = p.mflags;
+	if ( p.body )
 	{
-		switch ( body->Type )
+		switch ( p.body->Type )
 		{
-			case Function_Body:
-			case Execution:
-			case Untyped:
+			case CT_Function_Body:
+			case CT_Execution:
+			case CT_Untyped:
 				break;
 
 			default:
 			{
-				log_failure("gen::def_function: body must be either of Function_Body, Execution, or Untyped type. %s", body->debug_str());
-				return CodeInvalid;
+				log_failure("gen::def_function: body must be either of Function_Body, Execution, or Untyped type. %s", code_debug_str(p.body));
+				return InvalidCode;
 			}
 		}
-
-		result->Type = Function;
-		result->Body = body;
+		result->Type = CT_Function;
+		result->Body = p.body;
 	}
 	else
 	{
-		result->Type = Function_Fwd;
+		result->Type = CT_Function_Fwd;
 	}
-
-	if ( attributes )
-		result->Attributes = attributes;
-
-	if ( specifiers )
-		result->Specs = specifiers;
-
-	if ( ret_type )
-	{
-		result->ReturnType = ret_type;
-	}
-	else
-	{
-		result->ReturnType = t_void;
-	}
-
-	if ( params )
-		result->Params = params;
-
+	result->Attributes = p.attrs;
+	result->Specs      = p.specs;
+	result->Params     = p.params;
+	result->ReturnType = p.ret_type ? p.ret_type : t_void;
 	return result;
 }
 
-CodeInclude def_include( StrC path, bool foreign )
+CodeInclude def_include( Str path, Opts_def_include p )
 {
-	if ( path.Len <= 0 || path.Ptr == nullptr )
-	{
+	if ( path.Len <= 0 || path.Ptr == nullptr ) {
 		log_failure( "gen::def_include: Invalid path provided - %d" );
-		return CodeInvalid;
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
+	StrBuilder content = p.foreign ?
+			strbuilder_fmt_buf( _ctx->Allocator_Temp, "<%.*s>",   path.Len, path.Ptr )
+		:	strbuilder_fmt_buf( _ctx->Allocator_Temp, "\"%.*s\"", path.Len, path.Ptr );
 
-	StrC content = foreign ?
-			to_str( str_fmt_buf( "<%.*s>", path.Len, path.Ptr ))
-		:	to_str( str_fmt_buf( "\"%.*s\"", path.Len, path.Ptr ));
-
-	Code
-	result          = make_code();
-	result->Type    = ECode::Preprocess_Include;
-	result->Name    = get_cached_string( content );
+	CodeInclude
+	result          = (CodeInclude) make_code();
+	result->Type    = CT_Preprocess_Include;
+	result->Name    = cache_str( strbuilder_to_str(content) );
 	result->Content = result->Name;
-
-	return (CodeInclude) result;
+	return result;
 }
 
-CodeModule def_module( StrC name, ModuleFlag mflags )
+CodeModule def_module( Str name, Opts_def_module p )
 {
-	name_check( def_module, name );
-
-	Code
-	result              = make_code();
-	result->Type        = ECode::Module;
-	result->Name        = get_cached_string( name );
-	result->Content     = result->Name;
-	result->ModuleFlags = mflags;
-
-	return (CodeModule) result;
-}
-
-CodeNS def_namespace( StrC name, Code body, ModuleFlag mflags )
-{
-	using namespace ECode;
-
-	name_check( def_namespace, name );
-	null_check( def_namespace, body );
-
-	if ( body->Type != Namespace_Body && body->Type != Untyped )
-	{
-		log_failure("gen::def_namespace: body is not of namespace or untyped type %s", body.debug_str());
-		return CodeInvalid;
+	if ( ! name_check( def_module, name )) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
+	CodeModule
+	result              = (CodeModule) make_code();
+	result->Type        = CT_Module;
+	result->Name        = cache_str( name );
+	result->ModuleFlags = p.mflags;
+	return result;
+}
 
+CodeNS def_namespace( Str name, CodeBody body, Opts_def_namespace p )
+{
+	if ( ! name_check( def_namespace, name )) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	if ( ! null_check( def_namespace, body)) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	if ( body && body->Type != CT_Namespace_Body && body->Type != CT_Untyped ) {
+		log_failure("gen::def_namespace: body is not of namespace or untyped type %s", code_debug_str(body));
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
 	CodeNS
 	result              = (CodeNS) make_code();
-	result->Type        = Namespace;
-	result->Name        = get_cached_string( name );
-	result->ModuleFlags = mflags;
+	result->Type        = CT_Namespace;
+	result->Name        = cache_str( name );
+	result->ModuleFlags = p.mflags;
 	result->Body        = body;
-
 	return result;
 }
 
-CodeOperator def_operator( OperatorT op, StrC nspace
-	, CodeParam      params_code, CodeType       ret_type, Code body
-	, CodeSpecifiers specifiers,  CodeAttributes attributes
-	, ModuleFlag     mflags )
+CodeOperator def_operator( Operator op, Str nspace, Opts_def_operator p )
 {
-	using namespace ECode;
-
-	if ( attributes && attributes->Type != PlatformAttributes )
-	{
-		log_failure( "gen::def_operator: PlatformAttributes was provided but its not of attributes type: %s", attributes.debug_str() );
-		return CodeInvalid;
+	if ( p.attributes && p.attributes->Type != CT_PlatformAttributes ) {
+		log_failure( "gen::def_operator: PlatformAttributes was provided but its not of attributes type: %s", code_debug_str(p.attributes) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	if ( p.specifiers && p.specifiers->Type != CT_Specifiers ) {
+		log_failure( "gen::def_operator: Specifiers was provided but its not of specifiers type: %s", code_debug_str(p.specifiers) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
 
-	if ( specifiers && specifiers->Type != Specifiers )
-	{
-		log_failure( "gen::def_operator: Specifiers was provided but its not of specifiers type: %s", specifiers.debug_str() );
-		return CodeInvalid;
-	}
-
-	OpValidateResult check_result = operator__validate( op, params_code, ret_type, specifiers );
-
-	if ( check_result == OpValidateResult::Fail )
-	{
-		return CodeInvalid;
+	OpValidateResult check_result = operator__validate( op, p.params, p.ret_type, p.specifiers );
+	if ( check_result == OpValResult_Fail ) {
+		return InvalidCode;
 	}
 
 	char const* name = nullptr;
 
-	StrC op_str = to_str( op );
+	Str op_str = operator_to_str( op );
 	if ( nspace.Len > 0 )
-		name = str_fmt_buf( "%.*soperator %.*s", nspace.Len, nspace.Ptr, op_str.Len, op_str.Ptr );
+		name = c_str_fmt_buf( "%.*soperator %.*s", nspace.Len, nspace.Ptr, op_str.Len, op_str.Ptr );
 	else
-		name = str_fmt_buf( "operator %.*s", op_str.Len, op_str.Ptr );
+		name = c_str_fmt_buf( "operator %.*s", op_str.Len, op_str.Ptr );
+
+	Str name_resolved = { name, c_str_len(name) };
+
 	CodeOperator
 	result              = (CodeOperator) make_code();
-	result->Name        = get_cached_string( { str_len(name), name } );
-	result->ModuleFlags = mflags;
+	result->Name        = cache_str( name_resolved );
+	result->ModuleFlags = p.mflags;
 	result->Op          = op;
-
-	if ( body )
+	if ( p.body )
 	{
-		switch ( body->Type )
+		switch ( p.body->Type )
 		{
-			case Function_Body:
-			case Execution:
-			case Untyped:
+			case CT_Function_Body:
+			case CT_Execution:
+			case CT_Untyped:
 				break;
 
 			default:
 			{
-				log_failure("gen::def_operator: body must be either of Function_Body, Execution, or Untyped type. %s", body->debug_str());
-				return CodeInvalid;
+				log_failure("gen::def_operator: body must be either of Function_Body, Execution, or Untyped type. %s", code_debug_str(p.body));
+				GEN_DEBUG_TRAP();
+				return InvalidCode;
 			}
 		}
 
-		result->Type = check_result == OpValidateResult::Global ?
-			Operator : Operator_Member;
+		result->Type = check_result == OpValResult_Global ?
+			CT_Operator : CT_Operator_Member;
 
-		result->Body = body;
+		result->Body = p.body;
 	}
 	else
 	{
-		result->Type = check_result == OpValidateResult::Global ?
-			Operator_Fwd : Operator_Member_Fwd;
+		result->Type = check_result == OpValResult_Global ?
+			CT_Operator_Fwd : CT_Operator_Member_Fwd;
 	}
-
-	if ( attributes )
-		result->Attributes = attributes;
-
-	if ( specifiers )
-		result->Specs = specifiers;
-
-	result->ReturnType = ret_type;
-
-	if (params_code)
-		result->Params = params_code;
-
+	result->Attributes = p.attributes;
+	result->Specs      = p.specifiers;
+	result->ReturnType = p.ret_type;
+	result->Params     = p.params;
 	return result;
 }
 
-CodeOpCast def_operator_cast( CodeType type, Code body, CodeSpecifiers const_spec )
+CodeOpCast def_operator_cast( CodeTypename type, Opts_def_operator_cast p )
 {
-	using namespace ECode;
-	null_check( def_operator_cast, type );
-
-	if ( type->Type != Typename )
-	{
-		log_failure( "gen::def_operator_cast: type is not a typename - %s", type.debug_str() );
-		return CodeInvalid;
+	if ( ! null_check( def_operator_cast, type )) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	if ( type->Type != CT_Typename ) {
+		log_failure( "gen::def_operator_cast: type is not a typename - %s", code_debug_str(type) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
 
 	CodeOpCast result = (CodeOpCast) make_code();
-
-	if (body)
+	if (p.body)
 	{
-		result->Type = Operator_Cast;
+		result->Type = CT_Operator_Cast;
 
-		if ( body->Type != Function_Body && body->Type != Execution )
-		{
-			log_failure( "gen::def_operator_cast: body is not of function body or execution type - %s", body.debug_str() );
-			return CodeInvalid;
+		if ( p.body->Type != CT_Function_Body && p.body->Type != CT_Execution ) {
+			log_failure( "gen::def_operator_cast: body is not of function body or execution type - %s", code_debug_str(p.body) );
+			GEN_DEBUG_TRAP();
+			return InvalidCode;
 		}
-
-		result->Body = body;
+		result->Body = p.body;
 	}
 	else
 	{
-		result->Type = Operator_Cast_Fwd;
+		result->Type = CT_Operator_Cast_Fwd;
 	}
-
-	if ( const_spec )
-	{
-		result->Specs = const_spec;
-	}
-
+	result->Specs     = p.specs;
 	result->ValueType = type;
 	return result;
 }
 
-CodeParam def_param( CodeType type, StrC name, Code value )
+CodeParams def_param( CodeTypename type, Str name, Opts_def_param p )
 {
-	using namespace ECode;
-
-	name_check( def_param, name );
-	null_check( def_param, type );
-
-	if ( type->Type != Typename )
-	{
-		log_failure( "gen::def_param: type is not a typename - %s", type.debug_str() );
-		return CodeInvalid;
+	if ( ! name_check( def_param, name ) || ! null_check( def_param, type ) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( value && value->Type != Untyped )
-	{
-		log_failure( "gen::def_param: value is not untyped - %s", value.debug_str() );
-		return CodeInvalid;
+	if ( type->Type != CT_Typename ) {
+		log_failure( "gen::def_param: type is not a typename - %s", code_debug_str(type) );
+		return InvalidCode;
 	}
-
-	CodeParam
-	result       = (CodeParam) make_code();
-	result->Type = Parameters;
-	result->Name = get_cached_string( name );
-
+	if ( p.value && p.value->Type != CT_Untyped ) {
+		log_failure( "gen::def_param: value is not untyped - %s", code_debug_str(p.value) );
+		return InvalidCode;
+	}
+	CodeParams
+	result            = (CodeParams) make_code();
+	result->Type      = CT_Parameters;
+	result->Name      = cache_str( name );
 	result->ValueType = type;
-
-	if ( value )
-		result->Value = value;
-
+	result->Value     = p.value;
 	result->NumEntries++;
-
 	return result;
 }
 
-CodePragma def_pragma( StrC directive )
+CodePragma def_pragma( Str directive )
 {
-	using namespace ECode;
-
-	if ( directive.Len <= 0 || directive.Ptr == nullptr )
-	{
+	if ( directive.Len <= 0 || directive.Ptr == nullptr ) {
 		log_failure( "gen::def_comment: Invalid comment provided:" );
-		return CodeInvalid;
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
 	CodePragma
 	result          = (CodePragma) make_code();
-	result->Type    = Preprocess_Pragma;
-	result->Content = get_cached_string( directive );
-
+	result->Type    = CT_Preprocess_Pragma;
+	result->Content = cache_str( directive );
 	return result;
 }
 
-CodePreprocessCond def_preprocess_cond( EPreprocessCond type, StrC expr )
+CodePreprocessCond def_preprocess_cond( EPreprocessCond type, Str expr )
 {
-	using namespace ECode;
-
-	if ( expr.Len <= 0 || expr.Ptr == nullptr )
-	{
+	if ( expr.Len <= 0 || expr.Ptr == nullptr ) {
 		log_failure( "gen::def_comment: Invalid comment provided:" );
-		return CodeInvalid;
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
 	CodePreprocessCond
 	result          = (CodePreprocessCond) make_code();
-	result->Content = get_cached_string( expr );
-
+	result->Content = cache_str( expr );
 	switch (type)
 	{
-		case EPreprocessCond::If:
-			result->Type = Preprocess_If;
+		case PreprocessCond_If:
+			result->Type = CT_Preprocess_If;
 		break;
-		case EPreprocessCond::IfDef:
-			result->Type = Preprocess_IfDef;
+		case PreprocessCond_IfDef:
+			result->Type = CT_Preprocess_IfDef;
 		break;
-		case EPreprocessCond::IfNotDef:
-			result->Type = Preprocess_IfNotDef;
+		case PreprocessCond_IfNotDef:
+			result->Type = CT_Preprocess_IfNotDef;
 		break;
-		case EPreprocessCond::ElIf:
-			result->Type = Preprocess_ElIf;
+		case PreprocessCond_ElIf:
+			result->Type = CT_Preprocess_ElIf;
 		break;
 	}
-
 	return result;
 }
 
-CodeSpecifiers def_specifier( SpecifierT spec )
+CodeSpecifiers def_specifier( Specifier spec )
 {
 	CodeSpecifiers
 	result       = (CodeSpecifiers) make_code();
-	result->Type = ECode::Specifiers;
-	result.append( spec );
-
+	result->Type = CT_Specifiers;
+	specifiers_append(result, spec );
 	return result;
 }
 
-CodeStruct def_struct( StrC name
-	, Code           body
-	, CodeType       parent, AccessSpec parent_access
-	, CodeAttributes attributes
-	, ModuleFlag     mflags
-	, CodeType*      interfaces, s32 num_interfaces )
+CodeStruct def_struct( Str name, Opts_def_struct p )
 {
-	using namespace ECode;
-
-	if ( attributes && attributes->Type != PlatformAttributes )
-	{
-		log_failure( "gen::def_struct: attributes was not a `PlatformAttributes` type - %s", attributes.debug_str() );
-		return CodeInvalid;
+	if ( p.attributes && p.attributes->Type != CT_PlatformAttributes ) {
+		log_failure( "gen::def_struct: attributes was not a `PlatformAttributes` type - %s", code_debug_str(cast(Code, p.attributes)) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( parent && parent->Type != Typename )
-	{
-		log_failure( "gen::def_struct: parent was not a `Struct` type - %s", parent.debug_str() );
-		return CodeInvalid;
+	if ( p.parent && p.parent->Type != CT_Typename ) {
+		log_failure( "gen::def_struct: parent was not a `Struct` type - %s", code_debug_str(p.parent) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( body && body->Type != Struct_Body )
-	{
-		log_failure( "gen::def_struct: body was not a Struct_Body type - %s", body.debug_str() );
-		return CodeInvalid;
+	if ( p.body && p.body->Type != CT_Struct_Body ) {
+		log_failure( "gen::def_struct: body was not a Struct_Body type - %s", code_debug_str(p.body) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
 
 	CodeStruct
 	result              = (CodeStruct) make_code();
-	result->ModuleFlags = mflags;
+	result->ModuleFlags = p.mflags;
+	if ( name.Len )
+		result->Name = cache_str( name );
 
-	if ( name )
-		result->Name = get_cached_string( name );
-
-	if ( body )
-	{
-		result->Type = Struct;
-		result->Body = body;
+	if ( p.body ) {
+		result->Type = CT_Struct;
+		result->Body = p.body;
 	}
-	else
-	{
-		result->Type = Struct_Fwd;
+	else {
+		result->Type = CT_Struct_Fwd;
 	}
+	result->Attributes   = p.attributes;
+	result->ParentAccess = p.parent_access;
+	result->ParentType   = p.parent;
 
-	if ( attributes )
-		result->Attributes = attributes;
-
-	if ( parent )
-	{
-		result->ParentAccess = parent_access;
-		result->ParentType   = parent;
+	for (s32 idx = 0; idx < p.num_interfaces; idx++ ) {
+		struct_add_interface(result, p.interfaces[idx] );
 	}
-
-	if ( interfaces )
-	{
-		for (s32 idx = 0; idx < num_interfaces; idx++ )
-		{
-			result.add_interface( interfaces[idx] );
-		}
-	}
-
 	return result;
 }
 
-CodeTemplate def_template( CodeParam params, Code declaration, ModuleFlag mflags )
+CodeTemplate def_template( CodeParams params, Code declaration, Opts_def_template p )
 {
-	null_check( def_template, declaration );
-
-	if ( params && params->Type != ECode::Parameters )
-	{
-		log_failure( "gen::def_template: params is not of parameters type - %s", params.debug_str() );
-		return CodeInvalid;
+	if ( ! null_check( def_template, declaration ) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	if ( params && params->Type != CT_Parameters ){
+		log_failure( "gen::def_template: params is not of parameters type - %s", code_debug_str(params) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
 	switch (declaration->Type )
 	{
-		case ECode::Class:
-		case ECode::Function:
-		case ECode::Struct:
-		case ECode::Variable:
-		case ECode::Using:
+		case CT_Class:
+		case CT_Function:
+		case CT_Struct:
+		case CT_Variable:
+		case CT_Using:
 		break;
 
 		default:
-			log_failure( "gen::def_template: declaration is not of class, function, struct, variable, or using type - %s", declaration.debug_str() );
+			log_failure( "gen::def_template: declaration is not of class, function, struct, variable, or using type - %s", code_debug_str(declaration) );
 	}
-
 	CodeTemplate
 	result              = (CodeTemplate) make_code();
-	result->Type        = ECode::Template;
-	result->ModuleFlags = mflags;
+	result->Type        = CT_Template;
+	result->ModuleFlags = p.mflags;
 	result->Params      = params;
 	result->Declaration = declaration;
-
 	return result;
 }
 
-CodeType def_type( StrC name, Code arrayexpr, CodeSpecifiers specifiers, CodeAttributes attributes )
+CodeTypename def_type( Str name, Opts_def_type p )
 {
-	name_check( def_type, name );
-
-	if ( attributes && attributes->Type != ECode::PlatformAttributes )
-	{
-		log_failure( "gen::def_type: attributes is not of attributes type - %s", attributes.debug_str() );
-		return CodeInvalid;
+	if ( ! name_check( def_type, name )) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( specifiers && specifiers->Type != ECode::Specifiers )
-	{
-		log_failure( "gen::def_type: specifiers is not of specifiers type - %s", specifiers.debug_str() );
-		return CodeInvalid;
+	Code           arrayexpr  = p.arrayexpr;
+	CodeSpecifiers specifiers = p.specifiers;
+	CodeAttributes attributes = p.attributes;
+	if ( p.attributes && p.attributes->Type != CT_PlatformAttributes ) {
+		log_failure( "gen::def_type: attributes is not of attributes type - %s", code_debug_str((Code)p.attributes) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( arrayexpr && arrayexpr->Type != ECode::Untyped )
-	{
-		log_failure( "gen::def_type: arrayexpr is not of untyped type - %s", arrayexpr->debug_str() );
-		return CodeInvalid;
+	if ( p.specifiers && p.specifiers->Type != CT_Specifiers ) {
+		log_failure( "gen::def_type: specifiers is not of specifiers type - %s", code_debug_str((Code)p.specifiers) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	CodeType
-	result       = (CodeType) make_code();
-	result->Name = get_cached_string( name );
-	result->Type = ECode::Typename;
-
-	if ( attributes )
-		result->Attributes = attributes;
-
-	if ( specifiers )
-		result->Specs = specifiers;
-
-	if ( arrayexpr )
-		result->ArrExpr = arrayexpr;
-
+	if ( p.arrayexpr && p.arrayexpr->Type != CT_Untyped ) {
+		log_failure( "gen::def_type: arrayexpr is not of untyped type - %s", code_debug_str((Code)p.arrayexpr) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	CodeTypename
+	result             = (CodeTypename) make_code();
+	result->Name       = cache_str( name );
+	result->Type       = CT_Typename;
+	result->Attributes = p.attributes;
+	result->Specs      = p.specifiers;
+	result->ArrExpr    = p.arrayexpr;
+	result->TypeTag    = p.type_tag;
 	return result;
 }
 
-CodeTypedef def_typedef( StrC name, Code type, CodeAttributes attributes, ModuleFlag mflags )
+CodeTypedef def_typedef( Str name, Code type, Opts_def_typedef p )
 {
-	using namespace ECode;
-
-	null_check( def_typedef, type );
-
+	if ( ! null_check( def_typedef, type ) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
 	switch ( type->Type )
 	{
-		case Class:
-		case Class_Fwd:
-		case Enum:
-		case Enum_Fwd:
-		case Enum_Class:
-		case Enum_Class_Fwd:
-		case Function_Fwd:
-		case Struct:
-		case Struct_Fwd:
-		case Union:
-		case Typename:
+		case CT_Class:
+		case CT_Class_Fwd:
+		case CT_Enum:
+		case CT_Enum_Fwd:
+		case CT_Enum_Class:
+		case CT_Enum_Class_Fwd:
+		case CT_Function_Fwd:
+		case CT_Struct:
+		case CT_Struct_Fwd:
+		case CT_Union:
+		case CT_Typename:
 			break;
 		default:
-			log_failure( "gen::def_typedef: type was not a Class, Enum, Function Forward, Struct, Typename, or Union - %s", type.debug_str() );
-			return CodeInvalid;
+			log_failure( "gen::def_typedef: type was not a Class, Enum, Function Forward, Struct, Typename, or Union - %s", code_debug_str((Code)type) );
+			GEN_DEBUG_TRAP();
+			return InvalidCode;
 	}
-
-	if ( attributes && attributes->Type != ECode::PlatformAttributes )
-	{
-		log_failure( "gen::def_typedef: attributes was not a PlatformAttributes - %s", attributes.debug_str() );
-		return CodeInvalid;
+	if ( p.attributes && p.attributes->Type != CT_PlatformAttributes ) {
+		log_failure( "gen::def_typedef: attributes was not a PlatformAttributes - %s", code_debug_str((Code)p.attributes) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
 
 	// Registering the type.
-	Code registered_type = def_type( name );
-
-	if ( ! registered_type )
-	{
+	CodeTypename registered_type = def_type( name );
+	if ( ! registered_type ) {
 		log_failure( "gen::def_typedef: failed to register type" );
-		return CodeInvalid;
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
 
 	CodeTypedef
-	result              = (CodeTypedef) make_code();
-	result->Type        = ECode::Typedef;
-	result->ModuleFlags = mflags;
-
+	result                 = (CodeTypedef) make_code();
+	result->Type           = CT_Typedef;
+	result->ModuleFlags    = p.mflags;
 	result->UnderlyingType = type;
 
 	if ( name.Len <= 0  )
 	{
-		if (type->Type != Untyped)
-		{
-			log_failure( "gen::def_typedef: name was empty and type was not untyped (indicating its a function typedef) - %s", type.debug_str() );
-			return CodeInvalid;
+		if (type->Type != CT_Untyped) {
+			log_failure( "gen::def_typedef: name was empty and type was not untyped (indicating its a function typedef) - %s", code_debug_str(type) );
+			GEN_DEBUG_TRAP();
+			return InvalidCode;
 		}
-
-		result->Name       = get_cached_string( type->Name );
+		result->Name       = cache_str( type->Name );
 		result->IsFunction = true;
 	}
 	else
 	{
-		result->Name       = get_cached_string( name );
+		result->Name       = cache_str( name );
 		result->IsFunction = false;
 	}
-
 	return result;
 }
 
-CodeUnion def_union( StrC name, Code body, CodeAttributes attributes, ModuleFlag mflags )
+CodeUnion def_union( Str name, CodeBody body, Opts_def_union p )
 {
-	null_check( def_union, body );
-
-	if ( body->Type != ECode::Union_Body )
-	{
-		log_failure( "gen::def_union: body was not a Union_Body type - %s", body.debug_str() );
-		return CodeInvalid;
+	if ( ! null_check( def_union, body ) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( attributes && attributes->Type != ECode::PlatformAttributes )
-	{
-		log_failure( "gen::def_union: attributes was not a PlatformAttributes type - %s", attributes.debug_str() );
-		return CodeInvalid;
+	if ( body->Type != CT_Union_Body ) {
+		log_failure( "gen::def_union: body was not a Union_Body type - %s", code_debug_str(body) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	if ( p.attributes && p.attributes->Type != CT_PlatformAttributes ) {
+		log_failure( "gen::def_union: attributes was not a PlatformAttributes type - %s", code_debug_str(p.attributes) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
 	CodeUnion
 	result              = (CodeUnion) make_code();
-	result->ModuleFlags = mflags;
-	result->Type        = ECode::Union;
-
+	result->ModuleFlags = p.mflags;
+	result->Type        = CT_Union;
+	result->Body        = body;
+	result->Attributes  = p.attributes;
 	if ( name.Ptr )
-		result->Name = get_cached_string( name );
-
-	result->Body = body;
-
-	if ( attributes )
-		result->Attributes = attributes;
-
+		result->Name = cache_str( name );
 	return result;
 }
 
-CodeUsing def_using( StrC name, CodeType type
-	, CodeAttributes attributes
-	, ModuleFlag     mflags )
+CodeUsing def_using( Str name, CodeTypename type, Opts_def_using p )
 {
-	name_check( def_using, name );
-	null_check( def_using, type );
+	if ( ! name_check( def_using, name ) || null_check( def_using, type ) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
 
-	Code register_type = def_type( name );
-
-	if ( ! register_type )
-	{
+	CodeTypename register_type = def_type( name );
+	if ( ! register_type ) {
 		log_failure( "gen::def_using: failed to register type" );
-		return CodeInvalid;
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( attributes && attributes->Type != ECode::PlatformAttributes )
-	{
-		log_failure( "gen::def_using: attributes was not a PlatformAttributes type - %s", attributes.debug_str() );
-		return CodeInvalid;
+	if ( p.attributes && p.attributes->Type != CT_PlatformAttributes ) {
+		log_failure( "gen::def_using: attributes was not a PlatformAttributes type - %s", code_debug_str(p.attributes) );
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
 	CodeUsing
-	result              = (CodeUsing) make_code();
-	result->Name        = get_cached_string( name );
-	result->ModuleFlags = mflags;
-	result->Type = ECode::Using;
-
+	result                 = (CodeUsing) make_code();
+	result->Name           = cache_str( name );
+	result->ModuleFlags    = p.mflags;
+	result->Type           = CT_Using;
 	result->UnderlyingType = type;
-
-	if ( attributes )
-		result->Attributes = attributes;
-
+	result->Attributes     = p.attributes;
 	return result;
 }
 
-CodeUsing def_using_namespace( StrC name )
+CodeUsing def_using_namespace( Str name )
 {
-	name_check( def_using_namespace, name );
-
-	Code
-	result          = make_code();
-	result->Name    = get_cached_string( name );
-	result->Content = result->Name;
-	result->Type    = ECode::Using_Namespace;
-
-	return (CodeUsing) result;
+	if ( ! name_check( def_using_namespace, name ) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
+	}
+	CodeUsing
+	result          = (CodeUsing) make_code();
+	result->Name    = cache_str( name );
+	result->Type    = CT_Using_Namespace;
+	return result;
 }
 
-CodeVar def_variable( CodeType type, StrC name, Code value
-	, CodeSpecifiers specifiers, CodeAttributes attributes
-	, ModuleFlag     mflags )
+CodeVar def_variable( CodeTypename type, Str name, Opts_def_variable p )
 {
-	name_check( def_variable, name );
-	null_check( def_variable, type );
-
-	if ( attributes && attributes->Type != ECode::PlatformAttributes )
-	{
-		log_failure( "gen::def_variable: attributes was not a `PlatformAttributes` type - %s", attributes.debug_str() );
-		return CodeInvalid;
+	if ( ! name_check( def_variable, name ) || null_check( def_variable, type ) ) {
+		GEN_DEBUG_TRAP();
+		return InvalidCode;
 	}
-
-	if ( specifiers && specifiers->Type != ECode::Specifiers )
+	if ( p.attributes && p.attributes->Type != CT_PlatformAttributes )
 	{
-		log_failure( "gen::def_variable: specifiers was not a `Specifiers` type - %s", specifiers.debug_str() );
-		return CodeInvalid;
+		log_failure( "gen::def_variable: attributes was not a `PlatformAttributes` type - %s", code_debug_str(p.attributes) );
+		return InvalidCode;
 	}
-
-	if ( type->Type != ECode::Typename )
+	if ( p.specifiers && p.specifiers->Type != CT_Specifiers )
 	{
-		log_failure( "gen::def_variable: type was not a Typename - %s", type.debug_str() );
-		return CodeInvalid;
+		log_failure( "gen::def_variable: specifiers was not a `Specifiers` type - %s", code_debug_str(p.specifiers) );
+		return InvalidCode;
 	}
-
-	if ( value && value->Type != ECode::Untyped )
+	if ( type->Type != CT_Typename )
 	{
-		log_failure( "gen::def_variable: value was not a `Untyped` type - %s", value.debug_str() );
-		return CodeInvalid;
+		log_failure( "gen::def_variable: type was not a Typename - %s", code_debug_str(type) );
+		return InvalidCode;
+	}
+	if ( p.value && p.value->Type != CT_Untyped )
+	{
+		log_failure( "gen::def_variable: value was not a `Untyped` type - %s", code_debug_str(p.value) );
+		return InvalidCode;
 	}
-
 	CodeVar
 	result              = (CodeVar) make_code();
-	result->Name        = get_cached_string( name );
-	result->Type        = ECode::Variable;
-	result->ModuleFlags = mflags;
-
-	result->ValueType = type;
-
-	if ( attributes )
-		result->Attributes = attributes;
-
-	if ( specifiers )
-		result->Specs = specifiers;
-
-	if ( value )
-		result->Value = value;
-
+	result->Name        = cache_str( name );
+	result->Type        = CT_Variable;
+	result->ModuleFlags = p.mflags;
+	result->ValueType   = type;
+	result->Attributes  = p.attributes;
+	result->Specs       = p.specifiers;
+	result->Value       = p.value;
 	return result;
 }
 
 #pragma region Helper Macros for def_**_body functions
 #define def_body_start( Name_ )                                               \
-using namespace ECode;                                                        \
-																			  \
 if ( num <= 0 )                                                               \
 {                                                                             \
 	log_failure("gen::" stringize(Name_) ": num cannot be zero or negative"); \
-	return CodeInvalid;                                                       \
+	return InvalidCode;                                                       \
 }
 
 #define def_body_code_array_start( Name_ )                                     \
-using namespace ECode;                                                         \
-																			   \
 if ( num <= 0 )                                                                \
 {                                                                              \
 	log_failure("gen::" stringize(Name_) ": num cannot be zero or negative");  \
-	return CodeInvalid;                                                        \
+	return InvalidCode;                                                        \
 }                                                                              \
 																			   \
 if ( codes == nullptr )                                                        \
 {                                                                              \
 	log_failure("gen::" stringize(Name_)" : Provided a null array of codes");  \
-	return CodeInvalid;                                                        \
+	return InvalidCode;                                                        \
 }
 
 #pragma endregion Helper Macros for def_**_body functions
@@ -4844,7 +4873,7 @@ CodeBody def_class_body( s32 num, ... )
 	def_body_start( def_class_body );
 
 	CodeBody result = ( CodeBody )make_code();
-	result->Type    = Class_Body;
+	result->Type    = CT_Class_Body;
 
 	va_list va;
 	va_start( va, num );
@@ -4852,26 +4881,22 @@ CodeBody def_class_body( s32 num, ... )
 	{
 		Code_POD pod   = va_arg(va, Code_POD);
 		Code     entry = pcast(Code, pod);
-
-		if (!entry)
-		{
+		if ( ! entry) {
 			log_failure("gen::"
 						"def_class_body"
 						": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			GEN_AST_BODY_CLASS_UNALLOWED_TYPES
-				log_failure("gen::" "def_class_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return CodeInvalid;
+			GEN_AST_BODY_CLASS_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_class_body" ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
-
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 	va_end(va);
@@ -4885,43 +4910,99 @@ CodeBody def_class_body( s32 num, Code* codes )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Function_Body;
-
+	result->Type = CT_Function_Body;
 	do
 	{
 		Code entry = *codes;
 		codes++;
-
-		if (!entry)
-		{
+		if ( ! entry) {
 			log_failure("gen::" "def_class_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			GEN_AST_BODY_CLASS_UNALLOWED_TYPES
-				log_failure("gen::" "def_class_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return CodeInvalid;
+			GEN_AST_BODY_CLASS_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_class_body" ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
-
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 
 	return result;
 }
 
+CodeDefineParams def_define_params( s32 num, ... )
+{
+	def_body_start( def_define_params );
+
+	va_list va;
+	va_start(va, num);
+
+	Code_POD         pod   = va_arg(va, Code_POD);
+	CodeDefineParams param = pcast( CodeDefineParams, pod );
+
+	null_check( def_define_params, param );
+	if ( param->Type != CT_Parameters_Define ) {
+		log_failure( "gen::def_define_params: param %d is not a parameter for a preprocessor define", num - num + 1 );
+		return InvalidCode;
+	}
+
+	CodeDefineParams result = (CodeDefineParams) code_duplicate(param);
+	while ( -- num )
+	{
+		pod   = va_arg(va, Code_POD);
+		param = pcast( CodeDefineParams, pod );
+		if ( param->Type != CT_Parameters_Define ) {
+			log_failure( "gen::def_define_params: param %d is not a parameter for a preprocessor define", num - num + 1 );
+			return InvalidCode;
+		}
+		define_params_append(result, param );
+	}
+	va_end(va);
+
+	return result;
+}
+
+CodeDefineParams def_define_params( s32 num, CodeDefineParams* codes )
+{
+	def_body_code_array_start( def_define_params );
+
+#	define check_current(current)                                                                                                                 \
+	if ( current == nullptr ) {                                                                                                                   \
+		log_failure("gen::def_define_params: Provide a null code in codes array");                                                                \
+		return InvalidCode;                                                                                                                       \
+	}                                                                                                                                             \
+	if (current->Type != CT_Parameters_Define ) {                                                                                                 \
+		log_failure("gen::def_define_params: Code in coes array is not of paramter for preprocessor define type - %s", code_debug_str(current) ); \
+		return InvalidCode;                                                                                                                       \
+	}
+	CodeDefineParams current = (CodeDefineParams)code_duplicate(* codes);
+	check_current(current);
+
+	CodeDefineParams
+	result            = (CodeDefineParams) make_code();
+	result->Name      = current->Name;
+	result->Type      = current->Type;
+	while( codes++, current = * codes, num--, num > 0 ) {
+		check_current(current);
+		define_params_append(result, current );
+	}
+#	undef check_current
+
+	return result;
+}
+
 CodeBody def_enum_body( s32 num, ... )
 {
 	def_body_start( def_enum_body );
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Enum_Body;
+	result->Type = CT_Enum_Body;
 
 	va_list va;
 	va_start(va, num);
@@ -4929,20 +5010,15 @@ CodeBody def_enum_body( s32 num, ... )
 	{
 		Code_POD pod   = va_arg(va, Code_POD);
 		Code     entry = pcast(Code, pod);
-
-		if ( ! entry )
-		{
+		if ( ! entry ) {
 			log_failure("gen::def_enum_body: Provided a null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
-		if ( entry->Type != Untyped && entry->Type != Comment )
-		{
-			log_failure("gen::def_enum_body: Entry type is not allowed - %s. Must be of untyped or comment type.", entry.debug_str() );
-			return CodeInvalid;
+		if ( entry->Type != CT_Untyped && entry->Type != CT_Comment ) {
+			log_failure("gen::def_enum_body: Entry type is not allowed - %s. Must be of untyped or comment type.", code_debug_str(entry) );
+			return InvalidCode;
 		}
-
-		result.append( entry );
+		body_append(result, entry );
 	}
 	while ( num--, num > 0 );
 	va_end(va);
@@ -4956,25 +5032,19 @@ CodeBody def_enum_body( s32 num, Code* codes )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Enum_Body;
-
+	result->Type = CT_Enum_Body;
 	do
 	{
 		Code entry = *codes;
-
-		if ( ! entry )
-		{
+		if ( ! entry ) {
 			log_failure("gen::def_enum_body: Provided a null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
-		if ( entry->Type != Untyped && entry->Type != Comment )
-		{
-			log_failure("gen::def_enum_body: Entry type is not allowed: %s", entry.debug_str() );
-			return CodeInvalid;
+		if ( entry->Type != CT_Untyped && entry->Type != CT_Comment ) {
+			log_failure("gen::def_enum_body: Entry type is not allowed: %s", code_debug_str(entry) );
+			return InvalidCode;
 		}
-
-		result.append( entry );
+		body_append(result, entry );
 	}
 	while ( codes++, num--, num > 0 );
 
@@ -4987,7 +5057,7 @@ CodeBody def_export_body( s32 num, ... )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Export_Body;
+	result->Type = CT_Export_Body;
 
 	va_list va;
 	va_start(va, num);
@@ -4995,24 +5065,21 @@ CodeBody def_export_body( s32 num, ... )
 	{
 		Code_POD pod = va_arg(va, Code_POD);
 		Code     entry = pcast(Code, pod);
-
-		if (!entry)
+		if ( ! entry)
 		{
 			log_failure("gen::" "def_export_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			GEN_AST_BODY_EXPORT_UNALLOWED_TYPES
-				log_failure("gen::" "def_export_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return CodeInvalid;
+			GEN_AST_BODY_EXPORT_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_export_body" ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
-
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 	va_end(va);
@@ -5026,30 +5093,25 @@ CodeBody def_export_body( s32 num, Code* codes )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Export_Body;
-
+	result->Type = CT_Export_Body;
 	do
 	{
 		Code entry = *codes;
 		codes++;
-
-		if (!entry)
-		{
+		if ( ! entry) {
 			log_failure("gen::" "def_export_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			GEN_AST_BODY_EXPORT_UNALLOWED_TYPES
-				log_failure("gen::" "def_export_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return CodeInvalid;
+			GEN_AST_BODY_EXPORT_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_export_body" ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
-
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 
@@ -5062,32 +5124,28 @@ CodeBody def_extern_link_body( s32 num, ... )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Extern_Linkage_Body;
+	result->Type = CT_Extern_Linkage_Body;
 
 	va_list va;
 	va_start(va, num);
 	do
 	{
-		Code_POD pod = va_arg(va, Code_POD);
-		Code entry = pcast(Code, pod);
-
-		if (!entry)
-		{
+		Code_POD pod   = va_arg(va, Code_POD);
+		Code     entry = pcast(Code, pod);
+		if ( ! entry) {
 			log_failure("gen::" "def_extern_linkage_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES
-				log_failure("gen::" "def_extern_linkage_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return CodeInvalid;
+			GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_extern_linkage_body" ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
-
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 	va_end(va);
@@ -5101,31 +5159,26 @@ CodeBody def_extern_link_body( s32 num, Code* codes )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Extern_Linkage_Body;
-
+	result->Type = CT_Extern_Linkage_Body;
 	do
 	{
 		Code entry = *codes;
 		codes++;
-
 		if (!entry)
 		{
 			log_failure("gen::" "def_extern_linkage_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES
-				log_failure("gen::" "def_extern_linkage_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return CodeInvalid;
+			GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_extern_linkage_body" ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
-
-		result.append(entry);
-
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 
@@ -5138,7 +5191,7 @@ CodeBody def_function_body( s32 num, ... )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Function_Body;
+	result->Type = CT_Function_Body;
 
 	va_list va;
 	va_start(va, num);
@@ -5146,25 +5199,20 @@ CodeBody def_function_body( s32 num, ... )
 	{
 		Code_POD pod   = va_arg(va, Code_POD);
 		Code     entry = pcast(Code, pod);
-
-		if (!entry)
-		{
+		if ( ! entry) {
 			log_failure("gen::" stringize(def_function_body) ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-
-			GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES
-				log_failure("gen::" stringize(def_function_body) ": Entry type is not allowed: %s", entry.debug_str());
-				return CodeInvalid;
+			GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" stringize(def_function_body) ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
-
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 	va_end(va);
@@ -5178,29 +5226,25 @@ CodeBody def_function_body( s32 num, Code* codes )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Function_Body;
-
+	result->Type = CT_Function_Body;
 	do
 	{
 		Code entry = *codes;
 		codes++;
-
-		if (!entry)
-		{
+		if (!entry) {
 			log_failure("gen::" "def_function_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES
-				log_failure("gen::" "def_function_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return CodeInvalid;
+			GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_function_body" ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 
@@ -5213,7 +5257,7 @@ CodeBody def_global_body( s32 num, ... )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Global_Body;
+	result->Type = CT_Global_Body;
 
 	va_list va;
 	va_start(va, num);
@@ -5221,28 +5265,25 @@ CodeBody def_global_body( s32 num, ... )
 	{
 		Code_POD pod   = va_arg(va, Code_POD);
 		Code     entry = pcast(Code, pod);
-
-		if (!entry)
-		{
+		if ( ! entry) {
 			log_failure("gen::" "def_global_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			case Global_Body:
-				result.append( entry.cast<CodeBody>() ) ;
+			case CT_Global_Body:
+				// result.body_append( entry.code_cast<CodeBody>() ) ;
+				body_append_body( result, cast(CodeBody, entry) );
 				continue;
 
-			GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES
-				log_failure("gen::" "def_global_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return (*Code::Invalid.ast);
+			GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_global_body" ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
-
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 	va_end(va);
@@ -5256,34 +5297,30 @@ CodeBody def_global_body( s32 num, Code* codes )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Global_Body;
-
+	result->Type = CT_Global_Body;
 	do
 	{
 		Code entry = *codes;
 		codes++;
-
-		if (!entry)
-		{
+		if ( ! entry) {
 			log_failure("gen::" "def_global_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			case Global_Body:
-				result.append( entry.cast<CodeBody>() ) ;
+			case CT_Global_Body:
+				body_append_body(result, cast(CodeBody, entry) );
 				continue;
 
-			GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES
-				log_failure("gen::" "def_global_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return CodeInvalid;
+			GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_global_body" ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
 
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 
@@ -5296,7 +5333,7 @@ CodeBody def_namespace_body( s32 num, ... )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Namespace_Body;
+	result->Type = CT_Namespace_Body;
 
 	va_list va;
 	va_start(va, num);
@@ -5304,24 +5341,20 @@ CodeBody def_namespace_body( s32 num, ... )
 	{
 		Code_POD pod   = va_arg(va, Code_POD);
 		Code     entry = pcast(Code, pod);
-
-		if (!entry)
-		{
+		if ( ! entry) {
 			log_failure("gen::" "def_namespace_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES
-				log_failure("gen::" "def_namespace_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return CodeInvalid;
+			GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_namespace_body" ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
-
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 	va_end(va);
@@ -5335,36 +5368,31 @@ CodeBody def_namespace_body( s32 num, Code* codes )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Global_Body;
-
+	result->Type = CT_Global_Body;
 	do
 	{
 		Code entry = *codes;
 		codes++;
-
-		if (!entry)
-		{
+		if ( ! entry) {
 			log_failure("gen::" "def_namespace_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES
-				log_failure("gen::" "def_namespace_body" ": Entry type is not allowed: %s", entry.debug_str() );
-				return CodeInvalid;
+			GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_namespace_body" ": Entry type is not allowed: %s", code_debug_str(entry) );
+				return InvalidCode;
 
 			default: break;
 		}
-
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 
 	return result;
 }
 
-CodeParam def_params( s32 num, ... )
+CodeParams def_params( s32 num, ... )
 {
 	def_body_start( def_params );
 
@@ -5372,66 +5400,54 @@ CodeParam def_params( s32 num, ... )
 	va_start(va, num);
 
 	Code_POD  pod   = va_arg(va, Code_POD);
-	CodeParam param = pcast( CodeParam, pod );
+	CodeParams param = pcast( CodeParams, pod );
 
 	null_check( def_params, param );
-
-	if ( param->Type != Parameters )
-	{
+	if ( param->Type != CT_Parameters ) {
 		log_failure( "gen::def_params: param %d is not a Parameters", num - num + 1 );
-		return CodeInvalid;
+		return InvalidCode;
 	}
 
-	CodeParam result = (CodeParam) param.duplicate();
-
+	CodeParams result = (CodeParams) code_duplicate(param);
 	while ( -- num )
 	{
 		pod   = va_arg(va, Code_POD);
-		param = pcast( CodeParam, pod );
-
-		if ( param->Type != Parameters )
-		{
+		param = pcast( CodeParams, pod );
+		if ( param->Type != CT_Parameters ) {
 			log_failure( "gen::def_params: param %d is not a Parameters", num - num + 1 );
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
-		result.append( param );
+		params_append(result, param );
 	}
 	va_end(va);
 
 	return result;
 }
 
-CodeParam def_params( s32 num, CodeParam* codes )
+CodeParams def_params( s32 num, CodeParams* codes )
 {
 	def_body_code_array_start( def_params );
 
-#	define check_current()                                                                                      \
-	if ( current.ast == nullptr )                                                                               \
-	{                                                                                                           \
-		log_failure("gen::def_params: Provide a null code in codes array");                                     \
-		return CodeInvalid;                                                                                     \
-	}                                                                                                           \
-																												\
-	if (current->Type != Parameters )                                                                           \
-	{                                                                                                           \
-		log_failure("gen::def_params: Code in coes array is not of paramter type - %s", current.debug_str() );  \
-		return CodeInvalid;                                                                                     \
+#	define check_current(current)                                                                                      \
+	if ( current == nullptr ) {                                                                                        \
+		log_failure("gen::def_params: Provide a null code in codes array");                                            \
+		return InvalidCode;                                                                                            \
+	}                                                                                                                  \
+	if (current->Type != CT_Parameters ) {                                                                             \
+		log_failure("gen::def_params: Code in coes array is not of paramter type - %s", code_debug_str(current) );     \
+		return InvalidCode;                                                                                            \
 	}
+	CodeParams current = (CodeParams)code_duplicate(* codes);
+	check_current(current);
 
-	CodeParam current = (CodeParam) codes->duplicate();
-	check_current();
-
-	CodeParam
-	result            = (CodeParam) make_code();
+	CodeParams
+	result            = (CodeParams) make_code();
 	result->Name      = current->Name;
 	result->Type      = current->Type;
 	result->ValueType = current->ValueType;
-
-	while( codes++, current = * codes, num--, num > 0 )
-	{
-		check_current();
-		result.append( current );
+	while( codes++, current = * codes, num--, num > 0 ) {
+		check_current(current);
+		params_append(result, current );
 	}
 #	undef check_current
 
@@ -5440,29 +5456,23 @@ CodeParam def_params( s32 num, CodeParam* codes )
 
 CodeSpecifiers def_specifiers( s32 num, ... )
 {
-	if ( num <= 0 )
-	{
+	if ( num <= 0 ) {
 		log_failure("gen::def_specifiers: num cannot be zero or less");
-		return CodeInvalid;
+		return InvalidCode;
 	}
-
-	if ( num > AST::ArrSpecs_Cap )
-	{
+	if ( num > AST_ArrSpecs_Cap ) {
 		log_failure("gen::def_specifiers: num of speciifers to define AST larger than AST specicifier capacity - %d", num);
-		return CodeInvalid;
+		return InvalidCode;
 	}
-
 	CodeSpecifiers
 	result       = (CodeSpecifiers) make_code();
-	result->Type = ECode::Specifiers;
+	result->Type = CT_Specifiers;
 
 	va_list va;
 	va_start(va, num);
-	do
-	{
-		SpecifierT type = (SpecifierT)va_arg(va, int);
-
-		result.append( type );
+	do {
+		Specifier type = (Specifier)va_arg(va, int);
+		specifiers_append(result, type );
 	}
 	while ( --num, num );
 	va_end(va);
@@ -5470,28 +5480,23 @@ CodeSpecifiers def_specifiers( s32 num, ... )
 	return result;
 }
 
-CodeSpecifiers def_specifiers( s32 num, SpecifierT* specs )
+CodeSpecifiers def_specifiers( s32 num, Specifier* specs )
 {
-	if ( num <= 0 )
-	{
+	if ( num <= 0 ) {
 		log_failure("gen::def_specifiers: num cannot be zero or less");
-		return CodeInvalid;
+		return InvalidCode;
 	}
-
-	if ( num > AST::ArrSpecs_Cap )
-	{
+	if ( num > AST_ArrSpecs_Cap ) {
 		log_failure("gen::def_specifiers: num of speciifers to define AST larger than AST specicifier capacity - %d", num);
-		return CodeInvalid;
+		return InvalidCode;
 	}
-
 	CodeSpecifiers
 	result       = (CodeSpecifiers) make_code();
-	result->Type = ECode::Specifiers;
+	result->Type = CT_Specifiers;
 
 	s32 idx = 0;
-	do
-	{
-		result.append( specs[idx] );
+	do {
+		specifiers_append(result, specs[idx] );
 		idx++;
 	}
 	while ( --num, num );
@@ -5505,7 +5510,7 @@ CodeBody def_struct_body( s32 num, ... )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Struct_Body;
+	result->Type = CT_Struct_Body;
 
 	va_list va;
 	va_start(va, num);
@@ -5513,24 +5518,20 @@ CodeBody def_struct_body( s32 num, ... )
 	{
 		Code_POD pod   = va_arg(va, Code_POD);
 		Code     entry = pcast(Code, pod);
-
-		if (!entry)
-		{
+		if ( ! entry) {
 			log_failure("gen::" "def_struct_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			GEN_AST_BODY_STRUCT_UNALLOWED_TYPES
-				log_failure("gen::" "def_struct_body" ": Entry type is not allowed: %s", entry.debug_str());
-				return CodeInvalid;
+			GEN_AST_BODY_STRUCT_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_struct_body" ": Entry type is not allowed: %s", code_debug_str(entry));
+				return InvalidCode;
 
 			default:
 			break;
 		}
-
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 	va_end(va);
@@ -5544,30 +5545,25 @@ CodeBody def_struct_body( s32 num, Code* codes )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Struct_Body;
-
+	result->Type = CT_Struct_Body;
 	do
 	{
 		Code entry = *codes;
 		codes++;
-
-		if (!entry)
-		{
+		if ( ! entry) {
 			log_failure("gen::" "def_struct_body" ": Provided an null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
 		switch (entry->Type)
 		{
-			GEN_AST_BODY_STRUCT_UNALLOWED_TYPES
-				log_failure("gen::" "def_struct_body" ": Entry type is not allowed: %s", entry.debug_str() );
-				return CodeInvalid;
+			GEN_AST_BODY_STRUCT_UNALLOWED_TYPES_CASES:
+				log_failure("gen::" "def_struct_body" ": Entry type is not allowed: %s", code_debug_str(entry) );
+				return InvalidCode;
 
 			default:
 			break;
 		}
-
-		result.append(entry);
+		body_append(result, entry);
 	}
 	while (num--, num > 0);
 
@@ -5580,7 +5576,7 @@ CodeBody def_union_body( s32 num, ... )
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Union_Body;
+	result->Type = CT_Union_Body;
 
 	va_list va;
 	va_start(va, num);
@@ -5588,20 +5584,15 @@ CodeBody def_union_body( s32 num, ... )
 	{
 		Code_POD pod   = va_arg(va, Code_POD);
 		Code     entry = pcast( Code, pod );
-
-		if ( ! entry )
-		{
+		if ( ! entry ) {
 			log_failure("gen::def_union_body: Provided a null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
-		if ( entry->Type != Untyped && entry->Type != Comment )
-		{
-			log_failure("gen::def_union_body: Entry type is not allowed - %s. Must be of untyped or comment type.", entry.debug_str() );
-			return CodeInvalid;
+		if ( entry->Type != CT_Untyped && entry->Type != CT_Comment ) {
+			log_failure("gen::def_union_body: Entry type is not allowed - %s. Must be of untyped or comment type.", code_debug_str(entry) );
+			return InvalidCode;
 		}
-
-		result.append( entry );
+		body_append(result, entry );
 	}
 	while ( num--, num > 0 );
 	va_end(va);
@@ -5609,31 +5600,25 @@ CodeBody def_union_body( s32 num, ... )
 	return result;
 }
 
-CodeBody def_union_body( s32 num, CodeUnion* codes )
+CodeBody def_union_body( s32 num, Code* codes )
 {
 	def_body_code_array_start( def_union_body );
 
 	CodeBody
 	result       = (CodeBody) make_code();
-	result->Type = Union_Body;
-
+	result->Type = CT_Union_Body;
 	do
 	{
 		Code entry = *codes;
-
-		if ( ! entry )
-		{
+		if ( ! entry ) {
 			log_failure("gen::def_union_body: Provided a null entry");
-			return CodeInvalid;
+			return InvalidCode;
 		}
-
-		if ( entry->Type != Untyped && entry->Type != Comment )
-		{
-			log_failure("gen::def_union_body: Entry type is not allowed: %s", entry.debug_str() );
-			return CodeInvalid;
+		if ( entry->Type != CT_Untyped && entry->Type != CT_Comment ) {
+			log_failure("gen::def_union_body: Entry type is not allowed: %s", code_debug_str(entry) );
+			return InvalidCode;
 		}
-
-		result.append( entry );
+		body_append(result, entry );
 	}
 	while ( codes++, num--, num > 0 );
 
@@ -5642,7 +5627,6 @@ CodeBody def_union_body( s32 num, CodeUnion* codes )
 
 #	undef name_check
 #	undef null_check
-#	undef null_or_invalid_check
 #	undef def_body_start
 #	undef def_body_code_array_start
 
@@ -5650,455 +5634,70 @@ CodeBody def_union_body( s32 num, CodeUnion* codes )
 
 #pragma region Parsing
 
-namespace parser
+
+StrBuilder tok_to_strbuilder(Token tok)
 {
-	namespace ETokType
-	{
-#define GEN_DEFINE_ATTRIBUTE_TOKENS                                                                                 \
-	Entry( Attribute_API_Export, "GEN_API_Export_Code" ) Entry( Attribute_API_Import, "GEN_API_Import_Code" )       \
-	    Entry( Attribute_COREUOBJECT_API, "COREUOBJECT_API" ) Entry( Attribute_ENGINE_API, "ENGINE_API" )           \
-	        Entry( Attribute_GAMEPLAYABILITIES_API, "GAMEPLAYABILITIES_API" ) Entry( Attribute_UMG_API, "UMG_API" ) \
-	            Entry( Attribute_UE_DEPRECATED, "UE_DEPRECATED" )
+	StrBuilder result   = strbuilder_make_reserve( _ctx->Allocator_Temp, kilobytes(4) );
+	Str        type_str = toktype_to_str( tok.Type );
 
-		enum Type : u32
-		{
-			Invalid,
-			Access_Private,
-			Access_Protected,
-			Access_Public,
-			Access_MemberSymbol,
-			Access_StaticSymbol,
-			Ampersand,
-			Ampersand_DBL,
-			Assign_Classifer,
-			Attribute_Open,
-			Attribute_Close,
-			BraceCurly_Open,
-			BraceCurly_Close,
-			BraceSquare_Open,
-			BraceSquare_Close,
-			Capture_Start,
-			Capture_End,
-			Comment,
-			Comment_End,
-			Comment_Start,
-			Char,
-			Comma,
-			Decl_Class,
-			Decl_GNU_Attribute,
-			Decl_MSVC_Attribute,
-			Decl_Enum,
-			Decl_Extern_Linkage,
-			Decl_Friend,
-			Decl_Module,
-			Decl_Namespace,
-			Decl_Operator,
-			Decl_Struct,
-			Decl_Template,
-			Decl_Typedef,
-			Decl_Using,
-			Decl_Union,
-			Identifier,
-			Module_Import,
-			Module_Export,
-			NewLine,
-			Number,
-			Operator,
-			Preprocess_Hash,
-			Preprocess_Define,
-			Preprocess_If,
-			Preprocess_IfDef,
-			Preprocess_IfNotDef,
-			Preprocess_ElIf,
-			Preprocess_Else,
-			Preprocess_EndIf,
-			Preprocess_Include,
-			Preprocess_Pragma,
-			Preprocess_Content,
-			Preprocess_Macro,
-			Preprocess_Unsupported,
-			Spec_Alignas,
-			Spec_Const,
-			Spec_Consteval,
-			Spec_Constexpr,
-			Spec_Constinit,
-			Spec_Explicit,
-			Spec_Extern,
-			Spec_Final,
-			Spec_ForceInline,
-			Spec_Global,
-			Spec_Inline,
-			Spec_Internal_Linkage,
-			Spec_LocalPersist,
-			Spec_Mutable,
-			Spec_NeverInline,
-			Spec_Override,
-			Spec_Static,
-			Spec_ThreadLocal,
-			Spec_Volatile,
-			Spec_Virtual,
-			Star,
-			Statement_End,
-			StaticAssert,
-			String,
-			Type_Typename,
-			Type_Unsigned,
-			Type_Signed,
-			Type_Short,
-			Type_Long,
-			Type_bool,
-			Type_char,
-			Type_int,
-			Type_double,
-			Type_MS_int8,
-			Type_MS_int16,
-			Type_MS_int32,
-			Type_MS_int64,
-			Type_MS_W64,
-			Varadic_Argument,
-			__Attributes_Start,
-			Attribute_API_Export,
-			Attribute_API_Import,
-			Attribute_COREUOBJECT_API,
-			Attribute_ENGINE_API,
-			Attribute_GAMEPLAYABILITIES_API,
-			Attribute_UMG_API,
-			Attribute_UE_DEPRECATED,
-			NumTokens
-		};
+	strbuilder_append_fmt( & result, "Line: %d Column: %d, Type: %.*s Content: %.*s"
+		, tok.Line, tok.Column
+		, type_str.Len, type_str.Ptr
+		, tok.Text.Len, tok.Text.Ptr
+	);
+	return result;
+}
 
-		inline StrC to_str( Type type )
-		{
-			local_persist StrC lookup[] {
-				{ sizeof( "__invalid__" ),           "__invalid__"           },
-				{ sizeof( "private" ),               "private"               },
-				{ sizeof( "protected" ),             "protected"             },
-				{ sizeof( "public" ),                "public"                },
-				{ sizeof( "." ),                     "."                     },
-				{ sizeof( "::" ),                    "::"                    },
-				{ sizeof( "&" ),                     "&"                     },
-				{ sizeof( "&&" ),                    "&&"                    },
-				{ sizeof( ":" ),                     ":"                     },
-				{ sizeof( "[[" ),                    "[["                    },
-				{ sizeof( "]]" ),                    "]]"                    },
-				{ sizeof( "{" ),                     "{"                     },
-				{ sizeof( "}" ),                     "}"                     },
-				{ sizeof( "[" ),                     "["                     },
-				{ sizeof( "]" ),                     "]"                     },
-				{ sizeof( "(" ),                     "("                     },
-				{ sizeof( ")" ),                     ")"                     },
-				{ sizeof( "__comment__" ),           "__comment__"           },
-				{ sizeof( "__comment_end__" ),       "__comment_end__"       },
-				{ sizeof( "__comment_start__" ),     "__comment_start__"     },
-				{ sizeof( "__character__" ),         "__character__"         },
-				{ sizeof( "," ),                     ","                     },
-				{ sizeof( "class" ),                 "class"                 },
-				{ sizeof( "__attribute__" ),         "__attribute__"         },
-				{ sizeof( "__declspec" ),            "__declspec"            },
-				{ sizeof( "enum" ),                  "enum"                  },
-				{ sizeof( "extern" ),                "extern"                },
-				{ sizeof( "friend" ),                "friend"                },
-				{ sizeof( "module" ),                "module"                },
-				{ sizeof( "namespace" ),             "namespace"             },
-				{ sizeof( "operator" ),              "operator"              },
-				{ sizeof( "struct" ),                "struct"                },
-				{ sizeof( "template" ),              "template"              },
-				{ sizeof( "typedef" ),               "typedef"               },
-				{ sizeof( "using" ),                 "using"                 },
-				{ sizeof( "union" ),                 "union"                 },
-				{ sizeof( "__identifier__" ),        "__identifier__"        },
-				{ sizeof( "import" ),                "import"                },
-				{ sizeof( "export" ),                "export"                },
-				{ sizeof( "__new_line__" ),          "__new_line__"          },
-				{ sizeof( "__number__" ),            "__number__"            },
-				{ sizeof( "__operator__" ),          "__operator__"          },
-				{ sizeof( "#" ),                     "#"                     },
-				{ sizeof( "define" ),                "define"                },
-				{ sizeof( "if" ),                    "if"                    },
-				{ sizeof( "ifdef" ),                 "ifdef"                 },
-				{ sizeof( "ifndef" ),                "ifndef"                },
-				{ sizeof( "elif" ),                  "elif"                  },
-				{ sizeof( "else" ),                  "else"                  },
-				{ sizeof( "endif" ),                 "endif"                 },
-				{ sizeof( "include" ),               "include"               },
-				{ sizeof( "pragma" ),                "pragma"                },
-				{ sizeof( "__macro_content__" ),     "__macro_content__"     },
-				{ sizeof( "__macro__" ),             "__macro__"             },
-				{ sizeof( "__unsupported__" ),       "__unsupported__"       },
-				{ sizeof( "alignas" ),               "alignas"               },
-				{ sizeof( "const" ),                 "const"                 },
-				{ sizeof( "consteval" ),             "consteval"             },
-				{ sizeof( "constexpr" ),             "constexpr"             },
-				{ sizeof( "constinit" ),             "constinit"             },
-				{ sizeof( "explicit" ),              "explicit"              },
-				{ sizeof( "extern" ),                "extern"                },
-				{ sizeof( "final" ),                 "final"                 },
-				{ sizeof( "FORCEINLINE" ),           "FORCEINLINE"           },
-				{ sizeof( "global" ),                "global"                },
-				{ sizeof( "inline" ),                "inline"                },
-				{ sizeof( "internal" ),              "internal"              },
-				{ sizeof( "local_persist" ),         "local_persist"         },
-				{ sizeof( "mutable" ),               "mutable"               },
-				{ sizeof( "neverinline" ),           "neverinline"           },
-				{ sizeof( "override" ),              "override"              },
-				{ sizeof( "static" ),                "static"                },
-				{ sizeof( "thread_local" ),          "thread_local"          },
-				{ sizeof( "volatile" ),              "volatile"              },
-				{ sizeof( "virtual" ),               "virtual"               },
-				{ sizeof( "*" ),                     "*"                     },
-				{ sizeof( ";" ),                     ";"                     },
-				{ sizeof( "static_assert" ),         "static_assert"         },
-				{ sizeof( "__string__" ),            "__string__"            },
-				{ sizeof( "typename" ),              "typename"              },
-				{ sizeof( "unsigned" ),              "unsigned"              },
-				{ sizeof( "signed" ),                "signed"                },
-				{ sizeof( "short" ),                 "short"                 },
-				{ sizeof( "long" ),                  "long"                  },
-				{ sizeof( "bool" ),                  "bool"                  },
-				{ sizeof( "char" ),                  "char"                  },
-				{ sizeof( "int" ),                   "int"                   },
-				{ sizeof( "double" ),                "double"                },
-				{ sizeof( "__int8" ),                "__int8"                },
-				{ sizeof( "__int16" ),               "__int16"               },
-				{ sizeof( "__int32" ),               "__int32"               },
-				{ sizeof( "__int64" ),               "__int64"               },
-				{ sizeof( "_W64" ),                  "_W64"                  },
-				{ sizeof( "..." ),                   "..."                   },
-				{ sizeof( "__attrib_start__" ),      "__attrib_start__"      },
-				{ sizeof( "GEN_API_Export_Code" ),   "GEN_API_Export_Code"   },
-				{ sizeof( "GEN_API_Import_Code" ),   "GEN_API_Import_Code"   },
-				{ sizeof( "COREUOBJECT_API" ),       "COREUOBJECT_API"       },
-				{ sizeof( "ENGINE_API" ),            "ENGINE_API"            },
-				{ sizeof( "GAMEPLAYABILITIES_API" ), "GAMEPLAYABILITIES_API" },
-				{ sizeof( "UMG_API" ),               "UMG_API"               },
-				{ sizeof( "UE_DEPRECATED" ),         "UE_DEPRECATED"         },
-			};
-			return lookup[type];
-		}
+bool lex__eat( TokArray* self, TokType type );
 
-		inline Type to_type( StrC str )
-		{
-			local_persist u32 keymap[NumTokens];
-			do_once_start for ( u32 index = 0; index < NumTokens; index++ )
-			{
-				StrC enum_str = to_str( (Type)index );
-				keymap[index] = crc32( enum_str.Ptr, enum_str.Len - 1 );
-			}
-			do_once_end u32 hash = crc32( str.Ptr, str.Len );
-			for ( u32 index = 0; index < NumTokens; index++ )
-			{
-				if ( keymap[index] == hash )
-					return (Type)index;
-			}
-			return Invalid;
-		}
-
-	}    // namespace ETokType
-
-	using TokType = ETokType::Type;
-
-}    // namespace parser
-
-namespace parser {
-
-enum TokFlags : u32
+Token* lex_current(TokArray* self, bool skip_formatting )
 {
-	TF_Operator		   = bit(0),
-	TF_Assign          = bit(1),
-	TF_Preprocess      = bit(2),
-	TF_Preprocess_Cond = bit(3),
-	TF_Attribute       = bit(6),
-	TF_AccessOperator  = bit( 7 ),
-	TF_AccessSpecifier = bit( 8 ),
-	TF_Specifier       = bit( 9 ),
-	TF_EndDefinition   = bit( 10 ),    // Either ; or }
-	TF_Formatting      = bit( 11 ),
-	TF_Literal         = bit( 12 ),
+	if ( skip_formatting )
+	{
+		while ( self->Arr[self->Idx].Type == Tok_NewLine || self->Arr[self->Idx].Type == Tok_Comment  )
+			self->Idx++;
+	}
+	return & self->Arr[self->Idx];
+}
 
-	TF_Null = 0,
-};
-
-struct Token
+Token* lex_peek(TokArray self, bool skip_formatting)
 {
-	char const* Text;
-	sptr        Length;
-	TokType     Type;
-	s32         Line;
-	s32         Column;
-	u32         Flags;
-
-	operator bool()
+	s32 idx = self.Idx;
+	if ( skip_formatting )
 	{
-		return Text && Length && Type != TokType::Invalid;
+		while ( self.Arr[idx].Type == Tok_NewLine )
+			idx++;
+
+		return & self.Arr[idx];
 	}
+	return & self.Arr[idx];
+}
 
-	operator StrC()
-	{
-		return { Length, Text };
-	}
-
-	bool is_access_operator()
-	{
-		return bitfield_is_equal( u32, Flags, TF_AccessOperator );
-	}
-
-	bool is_access_specifier()
-	{
-		return bitfield_is_equal( u32, Flags, TF_AccessSpecifier );
-	}
-
-	bool is_attribute()
-	{
-		return bitfield_is_equal( u32, Flags, TF_Attribute );
-	}
-
-	bool is_operator()
-	{
-		return bitfield_is_equal( u32, Flags, TF_Operator );
-	}
-
-	bool is_preprocessor()
-	{
-		return bitfield_is_equal( u32, Flags, TF_Preprocess );
-	}
-
-	bool is_preprocess_cond()
-	{
-		return bitfield_is_equal( u32, Flags, TF_Preprocess_Cond );
-	}
-
-	bool is_specifier()
-	{
-		return bitfield_is_equal( u32, Flags, TF_Specifier );
-	}
-
-	bool is_end_definition()
-	{
-		return bitfield_is_equal( u32, Flags, TF_EndDefinition );
-	}
-
-	AccessSpec to_access_specifier()
-	{
-		return scast(AccessSpec, Type);
-	}
-
-	String to_string()
-	{
-		String result = String::make_reserve( GlobalAllocator, kilobytes(4) );
-
-		StrC type_str = ETokType::to_str( Type );
-
-		result.append_fmt( "Line: %d Column: %d, Type: %.*s Content: %.*s"
-			, Line, Column
-			, type_str.Len, type_str.Ptr
-			, Length, Text
-		);
-
-		return result;
-	}
-};
-
-constexpr Token NullToken { nullptr, 0, TokType::Invalid, false, 0, TF_Null };
-
-struct TokArray
+Token* lex_previous(TokArray self, bool skip_formatting)
 {
-	Array<Token> Arr;
-	s32          Idx;
-
-	bool __eat( TokType type );
-
-	Token& current( bool skip_formatting = true )
+	s32 idx = self.Idx;
+	if ( skip_formatting )
 	{
-		if ( skip_formatting )
-		{
-			while ( Arr[Idx].Type == TokType::NewLine || Arr[Idx].Type == TokType::Comment  )
-				Idx++;
-		}
+		while ( self.Arr[idx].Type == Tok_NewLine )
+			idx --;
 
-		return Arr[Idx];
+		return & self.Arr[idx];
 	}
+	return & self.Arr[idx - 1];
+}
 
-	Token& previous( bool skip_formatting = false )
+Token* lex_next(TokArray self, bool skip_formatting)
+{
+	s32 idx = self.Idx;
+	if ( skip_formatting )
 	{
-		s32 idx = this->Idx;
+		while ( self.Arr[idx].Type == Tok_NewLine )
+			idx++;
 
-		if ( skip_formatting )
-		{
-			while ( Arr[idx].Type == TokType::NewLine )
-				idx--;
-
-			return Arr[idx];
-		}
-
-		return Arr[idx - 1];
+		return & self.Arr[idx + 1];
 	}
-
-	Token& next( bool skip_formatting = false )
-	{
-		s32 idx = this->Idx;
-
-		if ( skip_formatting )
-		{
-			while ( Arr[idx].Type == TokType::NewLine )
-				idx++;
-
-			return Arr[idx + 1];
-		}
-
-		return Arr[idx + 1];
-	}
-
-	Token& operator []( s32 idx )
-	{
-		return Arr[idx];
-	}
-};
-
-global Arena_256KB     defines_map_arena;
-global HashTable<StrC> defines;
-global Array<Token>    Tokens;
-
-#define current ( * scanner )
-
-#define move_forward()          \
-	{                           \
-		if ( current == '\n' )  \
-		{                       \
-			line++;             \
-			column = 1;         \
-		}                       \
-		else                    \
-		{                       \
-			column++;           \
-		}                       \
-		left--;                 \
-		scanner++;              \
-	}
-
-#define SkipWhitespace()                        \
-	while ( left && char_is_space( current ) )  \
-	{                                           \
-		move_forward();                         \
-	}
-
-#define end_line()                          \
-	do                                      \
-	{                                       \
-		while ( left && current == ' ' )    \
-		{                                   \
-			move_forward();                 \
-		}                                   \
-		if ( left && current == '\r' )      \
-		{                                   \
-			move_forward();                 \
-			move_forward();                 \
-		}                                   \
-		else if ( left && current == '\n' ) \
-		{                                   \
-			move_forward();                 \
-		}                                   \
-	}                                       \
-	while (0)
+	return & self.Arr[idx + 1];
+}
 
 enum
 {
@@ -6107,475 +5706,627 @@ enum
 };
 
 FORCEINLINE
-s32 lex_preprocessor_directive(
-	  StrC&            content
-	, s32&             left
-	, char const*&     scanner
-	, s32&             line
-	, s32&             column
-	, HashTable<StrC>& defines
-	, Token&           token )
+void lexer_move_forward( LexContext* ctx )
 {
-	char const* hash = scanner;
-	Tokens.append( { hash, 1, TokType::Preprocess_Hash, line, column, TF_Preprocess } );
+	if ( * ctx->scanner == '\n' ) {
+		ctx->line   += 1;
+		ctx->column  = 1;
+	}
+	else {
+		++ ctx->column;
+	}
+	-- ctx->left;
+	++ ctx->scanner;
+}
+#define move_forward() lexer_move_forward(ctx)
 
-	move_forward();
-	SkipWhitespace();
-
-	token.Text = scanner;
-	while (left && ! char_is_space(current) )
-	{
+FORCEINLINE
+void lexer_skip_whitespace( LexContext* ctx )
+{
+	while ( ctx->left && char_is_space( * ctx->scanner ) )
 		move_forward();
-		token.Length++;
+}
+#define skip_whitespace() lexer_skip_whitespace(ctx)
+
+FORCEINLINE
+void lexer_end_line( LexContext* ctx )
+{
+	while ( ctx->left && (* ctx->scanner) == ' ' )
+		move_forward();
+
+	if ( ctx->left && (* ctx->scanner) == '\r' ) {
+		move_forward();
+		move_forward();
+	}
+	else if ( ctx->left && (* ctx->scanner) == '\n' )
+		move_forward();
+}
+#define end_line() lexer_end_line(ctx)
+
+// TODO(Ed): We need to to attempt to recover from a lex failure?
+s32 lex_preprocessor_define( LexContext* ctx )
+{
+	Token name = { { ctx->scanner, 1 }, Tok_Identifier, ctx->line, ctx->column, TF_Preprocess };
+	move_forward();
+
+	while ( ctx->left && ( char_is_alphanumeric((* ctx->scanner)) || (* ctx->scanner) == '_' ) ) {
+		move_forward();
+		name.Text.Len++;
 	}
 
-	token.Type = ETokType::to_type( token );
+	Specifier spec    = str_to_specifier( name.Text );
+	TokType   attrib  = str_to_toktype( name.Text );
+	b32 not_specifier = spec   == Spec_Invalid;
+	b32 not_attribute = attrib <= Tok___Attributes_Start;
 
-	bool   is_preprocessor = token.Type >= TokType::Preprocess_Define && token.Type <= TokType::Preprocess_Pragma;
+	Macro  macro            = { name.Text, MT_Expression, (MacroFlags)0 };
+	Macro* registered_macro = lookup_macro(name.Text);
+
+	if ( registered_macro == nullptr && not_specifier && not_attribute ) {
+		log_fmt("Warning: '%S' was not registered before the lexer processed its #define directive, it will be registered as a expression macro\n"
+			, name.Text 
+		);
+		// GEN_DEBUG_TRAP();
+	}
+	array_append( _ctx->Lexer_Tokens, name );
+
+	if ( ctx->left && (* ctx->scanner) == '(' )
+	{
+		if (registered_macro && ! macro_is_functional(* registered_macro)) {
+			log_fmt("Warning: %S registered macro is not flagged as functional yet the definition detects opening parenthesis '(' for arguments\n"
+				, name.Text
+			);
+			// GEN_DEBUG_TRAP();
+		}
+		else {
+			macro.Flags |= MF_Functional;
+		}
+
+		Token opening_paren = { { ctx->scanner, 1 }, Tok_Capture_Start, ctx->line, ctx->column, TF_Preprocess };
+		array_append( _ctx->Lexer_Tokens, opening_paren );
+		move_forward();
+
+		Token last_parameter;
+		// We need to tokenize the define's arguments now:
+		while( ctx->left && * ctx->scanner != ')')
+		{
+			skip_whitespace();
+			
+			Str possible_varadic = { ctx->scanner, 3 };
+			if ( ctx->left > 3 && str_are_equal( txt("..."), possible_varadic ) ) {
+				Token parameter = { { ctx->scanner, 3 }, Tok_Preprocess_Define_Param, ctx->line, ctx->column, TF_Preprocess };
+				move_forward();
+				move_forward();
+				move_forward();
+
+				array_append(_ctx->Lexer_Tokens, parameter);
+				skip_whitespace();
+				last_parameter = parameter;
+
+				while ( (* ctx->scanner) == '\\' ) {
+					move_forward();
+					skip_whitespace();
+				}
+				if (* ctx->scanner != ')' )
+				{
+					log_failure("lex_preprocessor_define(%d, %d): Expected a ')' after '...' (varaidc macro param) %S\n"
+						, ctx->line
+						, ctx->column
+						, name.Text
+					);
+					return Lex_ReturnNull;
+				}
+				break;
+			}
+			else if ( (* ctx->scanner) == '\\' ) {
+				move_forward();
+				skip_whitespace();
+				continue;
+			}
+			else if ( char_is_alpha( (* ctx->scanner) ) || (* ctx->scanner) == '_' )
+			{
+				Token parameter = { { ctx->scanner, 1 }, Tok_Preprocess_Define_Param, ctx->line, ctx->column, TF_Preprocess };
+				move_forward();
+
+				while ( ctx->left && ( char_is_alphanumeric((* ctx->scanner)) || (* ctx->scanner) == '_' ) )
+				{
+					move_forward();
+					parameter.Text.Len++;
+				}
+				array_append(_ctx->Lexer_Tokens, parameter);
+				skip_whitespace();
+				last_parameter = parameter;
+			}
+			else {
+				log_failure("lex_preprocessor_define(%d, %d): Expected a '_' or alpha character for a parameter name for %S\n"
+					, ctx->line
+					, ctx->column
+					, name.Text
+				);
+				return Lex_ReturnNull;
+			}
+
+			if (* ctx->scanner == ')' )
+				break;
+
+			// There should be a comma
+			if ( * ctx->scanner != ',' ) {
+				log_failure("lex_preprocessor_define(%d, %d): Expected a comma after parameter %S for %S\n"
+					, ctx->line
+					, ctx->column
+					, last_parameter.Text
+					, name.Text
+				);
+				return Lex_ReturnNull;
+			}
+			Token comma = { { ctx->scanner, 1 }, Tok_Comma, ctx->line, ctx->column, TF_Preprocess };
+			array_append(_ctx->Lexer_Tokens, comma);
+			move_forward();
+		}
+		
+		if ( * ctx->scanner != ')' ) {
+			log_failure("lex_preprocessor_define(%d, %d): Expected a ')' after last_parameter %S for %S (ran out of characters...)\n"
+				, ctx->line
+				, ctx->column
+				, last_parameter.Text
+				, name.Text
+			);
+			return Lex_ReturnNull;
+		}
+		Token closing_paren = { { ctx->scanner, 1 }, Tok_Capture_End, ctx->line, ctx->column, TF_Preprocess };
+		array_append(_ctx->Lexer_Tokens, closing_paren);
+		move_forward();
+	}
+	else if ( registered_macro && macro_is_functional( * registered_macro) ) {
+		if (registered_macro && ! macro_is_functional(* registered_macro)) {
+			log_fmt("Warning: %S registered macro is flagged as functional yet the definition detects no opening parenthesis '(' for arguments\n"
+				, name.Text
+			);
+			GEN_DEBUG_TRAP();
+		}
+	}
+
+	if ( registered_macro == nullptr ) {
+		register_macro(macro);
+	}
+
+	// Define's content handled by lex_preprocessor_directive (the original caller of this)
+	return Lex_Continue;
+}
+
+// TODO(Ed): We need to to attempt to recover from a lex failure?
+FORCEINLINE
+s32 lex_preprocessor_directive( LexContext* ctx )
+{
+	char const* hash = ctx->scanner;
+	Token hash_tok = { { hash, 1 }, Tok_Preprocess_Hash, ctx->line, ctx->column, TF_Preprocess };
+	array_append( _ctx->Lexer_Tokens, hash_tok  );
+
+	move_forward();
+	skip_whitespace();
+
+	ctx->token.Text.Ptr = ctx->scanner;
+	while (ctx->left && ! char_is_space((* ctx->scanner)) )
+	{
+		move_forward();
+		ctx->token.Text.Len++;
+	}
+
+	ctx->token.Type = str_to_toktype( tok_to_str(ctx->token) );
+
+	bool   is_preprocessor = ctx->token.Type >= Tok_Preprocess_Define && ctx->token.Type <= Tok_Preprocess_Pragma;
 	if ( ! is_preprocessor )
 	{
-		token.Type  = TokType::Preprocess_Unsupported;
+		ctx->token.Type  = Tok_Preprocess_Unsupported;
 
 		// Its an unsupported directive, skip it
 		s32 within_string = false;
 		s32 within_char   = false;
-		while ( left )
+		while ( ctx->left )
 		{
-			if ( current == '"' && ! within_char )
+			if ( * ctx->scanner == '"' && ! within_char )
 				within_string ^= true;
 
-			if ( current == '\'' && ! within_string )
+			if ( * ctx->scanner == '\'' && ! within_string )
 				within_char ^= true;
 
-			if ( current == '\\' && ! within_string && ! within_char )
+			if ( * ctx->scanner == '\\' && ! within_string && ! within_char )
 			{
 				move_forward();
-				token.Length++;
+				ctx->token.Text.Len++;
 
-				if ( current == '\r' )
+				if ( (* ctx->scanner) == '\r' )
 				{
 					move_forward();
-					token.Length++;
+					ctx->token.Text.Len++;
 				}
 
-				if ( current == '\n' )
+				if ( (* ctx->scanner) == '\n' )
 				{
 					move_forward();
-					token.Length++;
+					ctx->token.Text.Len++;
 					continue;
 				}
 				else
 				{
 					log_failure( "gen::Parser::lex: Invalid escape sequence '\\%c' (%d, %d)"
 								" in preprocessor directive (%d, %d)\n%.100s"
-						, current, line, column
-						, token.Line, token.Column, token.Text );
+						, (* ctx->scanner), ctx->line, ctx->column
+						, ctx->token.Line, ctx->token.Column, ctx->token.Text );
 					break;
 				}
 			}
 
-			if ( current == '\r' )
+			if ( (* ctx->scanner) == '\r' )
 			{
 				move_forward();
-				token.Length++;
+				ctx->token.Text.Len++;
 			}
 
-			if ( current == '\n' )
+			if ( (* ctx->scanner) == '\n' )
 			{
 				move_forward();
-				token.Length++;
+				ctx->token.Text.Len++;
 				break;
 			}
 
 			move_forward();
-			token.Length++;
+			ctx->token.Text.Len++;
 		}
 
-		token.Length = token.Length + token.Text - hash;
-		token.Text   = hash;
-		Tokens.append( token );
+		ctx->token.Text.Len = ctx->token.Text.Len + ctx->token.Text.Ptr - hash;
+		ctx->token.Text.Ptr = hash;
+		array_append( _ctx->Lexer_Tokens, ctx->token );
 		return Lex_Continue; // Skip found token, its all handled here.
 	}
 
-	if ( token.Type == TokType::Preprocess_Else || token.Type == TokType::Preprocess_EndIf )
+	if ( ctx->token.Type == Tok_Preprocess_Else || ctx->token.Type == Tok_Preprocess_EndIf )
 	{
-		token.Flags |= TF_Preprocess_Cond;
-		Tokens.append( token );
+		ctx->token.Flags |= TF_Preprocess_Cond;
+		array_append( _ctx->Lexer_Tokens, ctx->token );
 		end_line();
 		return Lex_Continue;
 	}
-	else if ( token.Type >= TokType::Preprocess_If && token.Type <= TokType::Preprocess_ElIf  )
+	else if ( ctx->token.Type >= Tok_Preprocess_If && ctx->token.Type <= Tok_Preprocess_ElIf  )
 	{
-		token.Flags |= TF_Preprocess_Cond;
+		ctx->token.Flags |= TF_Preprocess_Cond;
 	}
 
-	Tokens.append( token );
+	array_append( _ctx->Lexer_Tokens, ctx->token );
 
-	SkipWhitespace();
+	skip_whitespace();
 
-	if ( token.Type == TokType::Preprocess_Define )
+	if ( ctx->token.Type == Tok_Preprocess_Define )
 	{
-		Token name = { scanner, 0, TokType::Identifier, line, column, TF_Preprocess };
-
-		name.Text   = scanner;
-		name.Length = 1;
-		move_forward();
-
-		while ( left && ( char_is_alphanumeric(current) || current == '_' ) )
-		{
-			move_forward();
-			name.Length++;
-		}
-
-		if ( left && current == '(' )
-		{
-			move_forward();
-			name.Length++;
-		}
-
-		Tokens.append( name );
-
-		u64 key = crc32( name.Text, name.Length );
-		defines.set( key, name );
+		u32 result = lex_preprocessor_define(ctx); // handles: #define <name>( <params> ) - define's content handled later on within this scope.
+		if (result != Lex_Continue)
+			return Lex_ReturnNull;
 	}
 
-	Token preprocess_content = { scanner, 0, TokType::Preprocess_Content, line, column, TF_Preprocess };
+	Token preprocess_content = { { ctx->scanner, 0 }, Tok_Preprocess_Content, ctx->line, ctx->column, TF_Preprocess };
 
-	if ( token.Type == TokType::Preprocess_Include )
+	if ( ctx->token.Type == Tok_Preprocess_Include )
 	{
-		preprocess_content.Type = TokType::String;
+		preprocess_content.Type = Tok_String;
 
-		if ( current != '"' && current != '<' )
+		if ( (* ctx->scanner) != '"' && (* ctx->scanner) != '<' )
 		{
-			String directive_str = String::fmt_buf( GlobalAllocator, "%.*s", min( 80, left + preprocess_content.Length ), token.Text );
+			StrBuilder directive_str = strbuilder_fmt_buf( _ctx->Allocator_Temp, "%.*s", min( 80, ctx->left + preprocess_content.Text.Len ), ctx->token.Text.Ptr );
 
 			log_failure( "gen::Parser::lex: Expected '\"' or '<' after #include, not '%c' (%d, %d)\n%s"
-				, current
+				, (* ctx->scanner)
 				, preprocess_content.Line
 				, preprocess_content.Column
-				, directive_str.Data
+				, (char*) directive_str
 			);
 			return Lex_ReturnNull;
 		}
 		move_forward();
-		preprocess_content.Length++;
+		preprocess_content.Text.Len++;
 
-		while ( left && current != '"' && current != '>' )
+		while ( ctx->left && (* ctx->scanner) != '"' && (* ctx->scanner) != '>' )
 		{
 			move_forward();
-			preprocess_content.Length++;
+			preprocess_content.Text.Len++;
 		}
 
 		move_forward();
-		preprocess_content.Length++;
+		preprocess_content.Text.Len++;
 
-		if ( current == '\r' && scanner[1] == '\n' )
+		if ( (* ctx->scanner) == '\r' && ctx->scanner[1] == '\n' )
 		{
 			move_forward();
 			move_forward();
 		}
-		else if ( current == '\n' )
+		else if ( (* ctx->scanner) == '\n' )
 		{
 			move_forward();
 		}
 
-		Tokens.append( preprocess_content );
+		array_append( _ctx->Lexer_Tokens, preprocess_content );
 		return Lex_Continue; // Skip found token, its all handled here.
 	}
 
 	s32 within_string = false;
 	s32 within_char   = false;
 
-	// SkipWhitespace();
-	while ( left )
+	// Consume preprocess content
+	while ( ctx->left )
 	{
-		if ( current == '"' && ! within_char )
+		if ( (* ctx->scanner) == '"' && ! within_char )
 			within_string ^= true;
 
-		if ( current == '\'' && ! within_string )
+		if ( (* ctx->scanner) == '\'' && ! within_string )
 			within_char ^= true;
 
-		if ( current == '\\' && ! within_string && ! within_char )
+		if ( (* ctx->scanner) == '\\' && ! within_string && ! within_char )
 		{
 			move_forward();
-			preprocess_content.Length++;
+			preprocess_content.Text.Len++;
 
-			if ( current == '\r' )
+			if ( (* ctx->scanner) == '\r' )
 			{
 				move_forward();
-				preprocess_content.Length++;
+				preprocess_content.Text.Len++;
 			}
 
-			if ( current == '\n' )
+			if ( (* ctx->scanner) == '\n' )
 			{
 				move_forward();
-				preprocess_content.Length++;
+				preprocess_content.Text.Len++;
 				continue;
 			}
 			else
 			{
-				String directive_str = String::make_length( GlobalAllocator, token.Text, token.Length );
-				String content_str   = String::fmt_buf( GlobalAllocator, "%.*s", min( 400, left + preprocess_content.Length ), preprocess_content.Text );
+				StrBuilder directive_str = strbuilder_make_length( _ctx->Allocator_Temp, ctx->token.Text.Ptr, ctx->token.Text.Len );
+				StrBuilder content_str   = strbuilder_fmt_buf( _ctx->Allocator_Temp, "%.*s", min( 400, ctx->left + preprocess_content.Text.Len ), preprocess_content.Text.Ptr );
 
 				log_failure( "gen::Parser::lex: Invalid escape sequence '\\%c' (%d, %d)"
 							" in preprocessor directive '%s' (%d, %d)\n%s"
-					, current, line, column
+					, (* ctx->scanner), ctx->line, ctx->column
 					, directive_str, preprocess_content.Line, preprocess_content.Column
 					, content_str );
+				return Lex_ReturnNull;
 				break;
 			}
 		}
 
-		if ( current == '\r' )
+		if ( (* ctx->scanner) == '\r' )
 		{
-			move_forward();
+			break;
+			//move_forward();
 		}
 
-		if ( current == '\n' )
+		if ( (* ctx->scanner) == '\n' )
 		{
-			move_forward();
+			//move_forward();
 			break;
 		}
 
 		move_forward();
-		preprocess_content.Length++;
+		preprocess_content.Text.Len++;
 	}
 
-	Tokens.append( preprocess_content );
+	array_append( _ctx->Lexer_Tokens, preprocess_content );
 	return Lex_Continue; // Skip found token, its all handled here.
 }
 
 FORCEINLINE
-void lex_found_token( StrC& content
-	, s32&             left
-	, char const*&     scanner
-	, s32&             line
-	, s32&             column
-	, HashTable<StrC>& defines
-	, Token&           token )
+void lex_found_token( LexContext* ctx )
 {
-	if ( token.Type != TokType::Invalid )
-	{
-		Tokens.append( token );
+	if ( ctx->token.Type != Tok_Invalid ) {
+		array_append( _ctx->Lexer_Tokens, ctx->token );
 		return;
 	}
 
-	TokType type = ETokType::to_type( token );
+	TokType type = str_to_toktype( tok_to_str(ctx->token) );
 
-	if (type <= TokType::Access_Public && type >= TokType::Access_Private )
-	{
-		token.Flags |= TF_AccessSpecifier;
+	if (type <= Tok_Access_Public && type >= Tok_Access_Private ) {
+		ctx->token.Flags |= TF_AccessSpecifier;
 	}
-
-	if ( type > TokType::__Attributes_Start )
-	{
-		token.Flags |= TF_Attribute;
+	if ( type > Tok___Attributes_Start ) {
+		ctx->token.Flags |= TF_Attribute;
 	}
-
-	if ( type == ETokType::Decl_Extern_Linkage )
+	if ( type == Tok_Decl_Extern_Linkage )
 	{
-		SkipWhitespace();
+		skip_whitespace();
 
-		if ( current != '"' )
-		{
-			type         = ETokType::Spec_Extern;
-			token.Flags |= TF_Specifier;
+		if ( (* ctx->scanner) != '"' ) {
+			type         = Tok_Spec_Extern;
+			ctx->token.Flags |= TF_Specifier;
 		}
 
-		token.Type = type;
-		Tokens.append( token );
+		ctx->token.Type = type;
+		array_append( _ctx->Lexer_Tokens, ctx->token );
+		return;
+	}
+	if ( ( type <= Tok_Star && type >= Tok_Spec_Alignas)
+			|| type == Tok_Ampersand
+			|| type == Tok_Ampersand_DBL )
+	{
+		ctx->token.Type   = type;
+		ctx->token.Flags |= TF_Specifier;
+		array_append( _ctx->Lexer_Tokens, ctx->token );
+		return;
+	}
+	if ( type != Tok_Invalid )
+	{
+		ctx->token.Type = type;
+		array_append( _ctx->Lexer_Tokens, ctx->token );
 		return;
 	}
 
-	if ( ( type <= TokType::Star && type >= TokType::Spec_Alignas)
-			|| type == TokType::Ampersand
-			|| type == TokType::Ampersand_DBL )
-	{
-		token.Type   = type;
-		token.Flags |= TF_Specifier;
-		Tokens.append( token );
-		return;
+	Macro* macro = lookup_macro( ctx->token.Text );
+	b32 has_args          = ctx->left && (* ctx->scanner) == '(';
+	b32 resolved_to_macro = false;
+	if (macro) {
+		ctx->token.Type   = macrotype_to_toktype(macro->Type);
+		b32 is_functional = macro_is_functional(* macro);
+		resolved_to_macro = has_args ? is_functional : ! is_functional;
+		if ( ! resolved_to_macro ) {
+			log_fmt("Info(%d, %d): %S identified as a macro but usage here does not resolve to one (interpreting as identifier)\n"
+				, ctx->token.Line
+				, ctx->token.Line
+				, macro->Name
+			);
+		}
 	}
-
-
-	if ( type != TokType::Invalid )
+	if ( resolved_to_macro )
 	{
-		token.Type = type;
-		Tokens.append( token );
-		return;
-	}
-
-	u64 key = 0;
-	if ( current == '(')
-		key = crc32( token.Text, token.Length + 1 );
-	else
-		key = crc32( token.Text, token.Length );
-
-	StrC* define = defines.get( key );
-	if ( define )
-	{
-		token.Type = TokType::Preprocess_Macro;
-
+		// TODO(Ed): When we introduce a macro AST (and expression support), we'll properly lex this section.
 		// Want to ignore any arguments the define may have as they can be execution expressions.
-		if ( left && current == '(' )
-		{
-			move_forward();
-			token.Length++;
-
-			s32 level = 0;
-			while ( left && (current != ')' || level > 0) )
-			{
-				if ( current == '(' )
-					level++;
-
-				else if ( current == ')' && level > 0 )
-					level--;
-
-				move_forward();
-				token.Length++;
-			}
-
-			move_forward();
-			token.Length++;
+		if ( has_args ) {
+			ctx->token.Flags |= TF_Macro_Functional;
 		}
-
-		if ( current == '\r' && scanner[1] == '\n' )
-		{
-			move_forward();
-		}
-		else if ( current == '\n' )
-		{
-			move_forward();
+		if ( bitfield_is_set(MacroFlags, macro->Flags, MF_Allow_As_Attribute) ) {
+			ctx->token.Flags |= TF_Attribute;
 		}
 	}
 	else
 	{
-		token.Type = TokType::Identifier;
+		ctx->token.Type = Tok_Identifier;
 	}
 
-	Tokens.append( token );
+	array_append( _ctx->Lexer_Tokens, ctx->token );
 }
 
-
+// TODO(Ed): We need to to attempt to recover from a lex failure?
 neverinline
-// TokArray lex( Array<Token> tokens, StrC content )
-TokArray lex( StrC content )
+// TokArray lex( Array<Token> tokens, Str content )
+TokArray lex( Str content )
 {
-	s32         left    = content.Len;
-	char const* scanner = content.Ptr;
+	LexContext c; LexContext* ctx = & c;
+	c.content = content;
+	c.left    = content.Len;
+	c.scanner = content.Ptr;
 
-	char const* word        = scanner;
+	char const* word        = c.scanner;
 	s32         word_length = 0;
 
-	s32 line   = 1;
-	s32 column = 1;
+	c.line   = 1;
+	c.column = 1;
 
-	SkipWhitespace();
-	if ( left <= 0 )
+	skip_whitespace();
+	if ( c.left <= 0 )
 	{
 		log_failure( "gen::lex: no tokens found (only whitespace provided)" );
-		return { { nullptr }, 0 };
+		TokArray null_array = {};
+		return null_array;
 	}
 
-	for ( StringCached entry : PreprocessorDefines )
-	{
-		s32         length  = 0;
-		char const* scanner = entry.Data;
-		while ( entry.length() > length && (char_is_alphanumeric( *scanner ) || *scanner == '_') )
-		{
-			scanner++;
-			length ++;
-		}
-		if ( scanner[0] == '(' )
-		{
-			length++;
-		}
+	array_clear(_ctx->Lexer_Tokens);
 
-		u64 key = crc32( entry.Data, length );
-		defines.set( key, entry );
-	}
+	b32 preprocess_args = true;
 
-	Tokens.clear();
-
-	while (left )
+	while (c.left )
 	{
 		#if 0
 		if (Tokens.num())
 		{
-			log_fmt("\nLastTok: %S", Tokens.back().to_string());
+			log_fmt("\nLastTok: %SB", Tokens.back().to_strbuilder());
 		}
 		#endif
 
-		Token token = { scanner, 0, TokType::Invalid, line, column, TF_Null };
+		{
+			Token thanks_c = { { c.scanner, 0 }, Tok_Invalid, c.line, c.column, TF_Null };
+			c.token = thanks_c;
+		}
 
 		bool is_define = false;
 
-		if ( column == 1 )
+		if ( c.column == 1 )
 		{
-			if ( current == '\r')
+			if ( (* ctx->scanner) == '\r')
 			{
 				move_forward();
-				token.Length = 1;
+				c.token.Text.Len = 1;
 			}
 
-			if ( current == '\n' )
+			if ( (* ctx->scanner) == '\n' )
 			{
 				move_forward();
 
-				token.Type = TokType::NewLine;
-				token.Length++;
+				c.token.Type = Tok_NewLine;
+				c.token.Text.Len++;
 
-				Tokens.append( token );
+				array_append( _ctx->Lexer_Tokens, c.token );
 				continue;
 			}
 		}
 
-		token.Length = 0;
+		c.token.Text.Len = 0;
 
-		SkipWhitespace();
-		if ( left <= 0 )
+		skip_whitespace();
+		if ( c.left <= 0 )
 			break;
 
-		switch ( current )
+		switch ( (* ctx->scanner) )
 		{
 			case '#':
 			{
-				s32 result = lex_preprocessor_directive( content, left, scanner, line, column, defines, token );
+				s32 result = lex_preprocessor_directive( ctx );
 				switch ( result )
 				{
 					case Lex_Continue:
+					{
+						//TokType last_type = Tokens[array_get_header(Tokens)->Num - 2].Type;
+						//if ( last_type == Tok_Preprocess_Pragma )
+						{
+							{
+								Token thanks_c = { { c.scanner, 0 }, Tok_Invalid, c.line, c.column, TF_Null };
+								c.token = thanks_c;
+							}
+							if ( (* ctx->scanner) == '\r')
+							{
+								move_forward();
+								c.token.Text.Len = 1;
+							}
+
+							if ( (* ctx->scanner) == '\n' )
+							{
+								c.token.Type = Tok_NewLine;
+								c.token.Text.Len++;
+								move_forward();
+
+								array_append( _ctx->Lexer_Tokens, c.token );
+							}
+						}
 						continue;
+					}
 
 					case Lex_ReturnNull:
-						return { { nullptr }, 0 };
+					{
+						TokArray tok_array =  {};
+						return tok_array;
+					}
 				}
 			}
 			case '.':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Access_MemberSymbol;
-				token.Flags  = TF_AccessOperator;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_Access_MemberSymbol;
+				c.token.Flags  = TF_AccessOperator;
 
-				if (left) {
+				if (c.left) {
 					move_forward();
 				}
 
-				if ( current == '.' )
+				if ( (* ctx->scanner) == '.' )
 				{
 					move_forward();
-					if( current == '.' )
+					if( (* ctx->scanner) == '.' )
 					{
-						token.Length = 3;
-						token.Type   = TokType::Varadic_Argument;
-						token.Flags  = TF_Null;
+						c.token.Text.Len = 3;
+						c.token.Type     = Tok_Varadic_Argument;
+						c.token.Flags    = TF_Null;
 						move_forward();
 					}
 					else
 					{
-						String context_str = String::fmt_buf( GlobalAllocator, "%s", scanner, min( 100, left ) );
+						StrBuilder context_str = strbuilder_fmt_buf( _ctx->Allocator_Temp, "%s", c.scanner, min( 100, c.left ) );
 
-						log_failure( "gen::lex: invalid varadic argument, expected '...' got '..%c' (%d, %d)\n%s", current, line, column, context_str );
+						log_failure( "gen::lex: invalid varadic argument, expected '...' got '..%c' (%d, %d)\n%s", (* ctx->scanner), c.line, c.column, context_str );
 					}
 				}
 
@@ -6583,21 +6334,21 @@ TokArray lex( StrC content )
 			}
 			case '&' :
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Ampersand;
-				token.Flags |= TF_Operator;
-				token.Flags |= TF_Specifier;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_Ampersand;
+				c.token.Flags |= TF_Operator;
+				c.token.Flags |= TF_Specifier;
 
-				if (left)
+				if (c.left)
 					move_forward();
 
-				if ( current == '&' )	// &&
+				if ( (* ctx->scanner) == '&' )	// &&
 				{
-					token.Length  = 2;
-					token.Type    = TokType::Ampersand_DBL;
+					c.token.Text.Len = 2;
+					c.token.Type     = Tok_Ampersand_DBL;
 
-					if (left)
+					if (c.left)
 						move_forward();
 				}
 
@@ -6605,41 +6356,41 @@ TokArray lex( StrC content )
 			}
 			case ':':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Assign_Classifer;
+				Str text = { c.scanner, 1 };
+				c.token.Text = text;
+				c.token.Type = Tok_Assign_Classifer;
 				// Can be either a classifier (ParentType, Bitfield width), or ternary else
-				// token.Type   = TokType::Colon;
+				// token.Type   = Tok_Colon;
 
-				if (left)
+				if (c.left)
 					move_forward();
 
-				if ( current == ':' )
+				if ( (* ctx->scanner) == ':' )
 				{
 					move_forward();
-					token.Type  = TokType::Access_StaticSymbol;
-					token.Length++;
+					c.token.Type = Tok_Access_StaticSymbol;
+					c.token.Text.Len++;
 				}
 				goto FoundToken;
 			}
 			case '{':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::BraceCurly_Open;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_BraceCurly_Open;
 
-				if (left)
+				if (c.left)
 					move_forward();
 				goto FoundToken;
 			}
 			case '}':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::BraceCurly_Close;
-				token.Flags  = TF_EndDefinition;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_BraceCurly_Close;
+				c.token.Flags  = TF_EndDefinition;
 
-				if (left)
+				if (c.left)
 					move_forward();
 
 				end_line();
@@ -6647,17 +6398,17 @@ TokArray lex( StrC content )
 			}
 			case '[':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::BraceSquare_Open;
-				if ( left )
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_BraceSquare_Open;
+				if ( c.left )
 				{
 					move_forward();
 
-					if ( current == ']' )
+					if ( (* ctx->scanner) == ']' )
 					{
-						token.Length = 2;
-						token.Type   = TokType::Operator;
+						c.token.Text.Len = 2;
+						c.token.Type     = Tok_Operator;
 						move_forward();
 					}
 				}
@@ -6665,97 +6416,97 @@ TokArray lex( StrC content )
 			}
 			case ']':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::BraceSquare_Close;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_BraceSquare_Close;
 
-				if (left)
+				if (c.left)
 					move_forward();
 				goto FoundToken;
 			}
 			case '(':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Capture_Start;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_Capture_Start;
 
-				if (left)
+				if (c.left)
 					move_forward();
 				goto FoundToken;
 			}
 			case ')':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Capture_End;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_Capture_End;
 
-				if (left)
+				if (c.left)
 					move_forward();
 				goto FoundToken;
 			}
 			case '\'':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Char;
-				token.Flags  = TF_Literal;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_Char;
+				c.token.Flags  = TF_Literal;
 
 				move_forward();
 
-				if ( left && current == '\\' )
+				if ( c.left && (* ctx->scanner) == '\\' )
 				{
 					move_forward();
-					token.Length++;
+					c.token.Text.Len++;
 
-					if ( current == '\'' )
+					if ( (* ctx->scanner) == '\'' )
 					{
 						move_forward();
-						token.Length++;
+						c.token.Text.Len++;
 					}
 				}
 
-				while ( left && current != '\'' )
+				while ( c.left && (* ctx->scanner) != '\'' )
 				{
 					move_forward();
-					token.Length++;
+					c.token.Text.Len++;
 				}
 
-				if ( left )
+				if ( c.left )
 				{
 					move_forward();
-					token.Length++;
+					c.token.Text.Len++;
 				}
 				goto FoundToken;
 			}
 			case ',':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Comma;
-				token.Flags  = TF_Operator;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_Comma;
+				c.token.Flags  = TF_Operator;
 
-				if (left)
+				if (c.left)
 					move_forward();
 				goto FoundToken;
 			}
 			case '*':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Star;
-				token.Flags |= TF_Specifier;
-				token.Flags |= TF_Operator;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_Star;
+				c.token.Flags |= TF_Specifier;
+				c.token.Flags |= TF_Operator;
 
-				if (left)
+				if (c.left)
 					move_forward();
 
-				if ( current == '=' )
+				if ( (* ctx->scanner) == '=' )
 				{
-					token.Length++;
-					token.Flags |= TF_Assign;
-					// token.Type = TokType::Assign_Multiply;
+					c.token.Text.Len++;
+					c.token.Flags |= TF_Assign;
+					// c.token.Type = Tok_Assign_Multiply;
 
-					if ( left )
+					if ( c.left )
 						move_forward();
 				}
 
@@ -6763,12 +6514,12 @@ TokArray lex( StrC content )
 			}
 			case ';':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Statement_End;
-				token.Flags  = TF_EndDefinition;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_Statement_End;
+				c.token.Flags  = TF_EndDefinition;
 
-				if (left)
+				if (c.left)
 					move_forward();
 
 				end_line();
@@ -6776,69 +6527,69 @@ TokArray lex( StrC content )
 			}
 			case '"':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::String;
-				token.Flags |= TF_Literal;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_String;
+				c.token.Flags |= TF_Literal;
 
 				move_forward();
-				while ( left )
+				while ( c.left )
 				{
-					if ( current == '"' )
+					if ( (* ctx->scanner) == '"' )
 					{
 						move_forward();
 						break;
 					}
 
-					if ( current == '\\' )
+					if ( (* ctx->scanner) == '\\' )
 					{
 						move_forward();
-						token.Length++;
+						c.token.Text.Len++;
 
-						if ( left )
+						if ( c.left )
 						{
 							move_forward();
-							token.Length++;
+							c.token.Text.Len++;
 						}
 						continue;
 					}
 
 					move_forward();
-					token.Length++;
+					c.token.Text.Len++;
 				}
 				goto FoundToken;
 			}
 			case '?':
 			{
-				token.Text     = scanner;
-				token.Length   = 1;
-				token.Type     = TokType::Operator;
-				// token.Type     = TokType::Ternary;
-				token.Flags    = TF_Operator;
+				Str text = { c.scanner, 1 };
+				c.token.Text     = text;
+				c.token.Type     = Tok_Operator;
+				// c.token.Type     = Tok_Ternary;
+				c.token.Flags    = TF_Operator;
 
-				if (left)
+				if (c.left)
 					move_forward();
 
 				goto FoundToken;
 			}
 			case '=':
 			{
-				token.Text     = scanner;
-				token.Length   = 1;
-				token.Type     = TokType::Operator;
-				// token.Type     = TokType::Assign;
-				token.Flags    = TF_Operator;
-				token.Flags   |= TF_Assign;
+				Str text = { c.scanner, 1 };
+				c.token.Text     = text;
+				c.token.Type     = Tok_Operator;
+				// c.token.Type     = Tok_Assign;
+				c.token.Flags    = TF_Operator;
+				c.token.Flags   |= TF_Assign;
 
-				if (left)
+				if (c.left)
 					move_forward();
 
-				if ( current == '=' )
+				if ( (* ctx->scanner) == '=' )
 				{
-					token.Length++;
-					token.Flags = TF_Operator;
+					c.token.Text.Len++;
+					c.token.Flags = TF_Operator;
 
-					if (left)
+					if (c.left)
 						move_forward();
 				}
 
@@ -6846,108 +6597,108 @@ TokArray lex( StrC content )
 			}
 			case '+':
 			{
-				// token.Type = TokType::Add
+				// c.token.Type = Tok_Add
 
 			}
 			case '%':
 			{
-				// token.Type = TokType::Modulo;
+				// c.token.Type = Tok_Modulo;
 
 			}
 			case '^':
 			{
-				// token.Type = TokType::B_XOr;
+				// c.token.Type = Tok_B_XOr;
 			}
 			case '~':
 			{
-				// token.Type = TokType::Unary_Not;
+				// c.token.Type = Tok_Unary_Not;
 
 			}
 			case '!':
 			{
-				// token.Type = TokType::L_Not;
+				// c.token.Type = Tok_L_Not;
 			}
 			case '<':
 			{
-				// token.Type = TokType::Lesser;
+				// c.token.Type = Tok_Lesser;
 
 			}
 			case '>':
 			{
-				// token.Type = TokType::Greater;
+				// c.token.Type = Tok_Greater;
 
 			}
 			case '|':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Operator;
-				token.Flags  = TF_Operator;
-				// token.Type   = TokType::L_Or;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_Operator;
+				c.token.Flags  = TF_Operator;
+				// token.Type   = Tok_L_Or;
 
-				if (left)
+				if (c.left)
 					move_forward();
 
-				if ( current == '=' )
+				if ( (* ctx->scanner) == '=' )
 				{
-					token.Length++;
-					token.Flags |= TF_Assign;
+					c.token.Text.Len++;
+					c.token.Flags |= TF_Assign;
 					// token.Flags |= TokFlags::Assignment;
-					// token.Type = TokType::Assign_L_Or;
+					// token.Type = Tok_Assign_L_Or;
 
-					if (left)
+					if (c.left)
 						move_forward();
 				}
-				else while ( left && current == *(scanner - 1) && token.Length < 3 )
+				else while ( c.left && (* ctx->scanner) == *(c.scanner - 1) && c.token.Text.Len < 3 )
 				{
-					token.Length++;
+					c.token.Text.Len++;
 
-					if (left)
+					if (c.left)
 						move_forward();
 				}
 				goto FoundToken;
 			}
 
-			// Dash is unfortunatlly a bit more complicated...
+			// Dash is unfortunately a bit more complicated...
 			case '-':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Operator;
-				// token.Type = TokType::Subtract;
-				token.Flags  = TF_Operator;
-				if ( left )
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_Operator;
+				// token.Type = Tok_Subtract;
+				c.token.Flags  = TF_Operator;
+				if ( c.left )
 				{
 					move_forward();
 
-					if ( current == '>'  )
+					if ( (* ctx->scanner) == '>'  )
 					{
-						token.Length++;
-//						token.Type = TokType::Access_PointerToMemberSymbol;
-						token.Flags |= TF_AccessOperator;
+						c.token.Text.Len++;
+//						token.Type = Tok_Access_PointerToMemberSymbol;
+						c.token.Flags |= TF_AccessOperator;
 						move_forward();
 
-						if ( current == '*' )
+						if ( (* ctx->scanner) == '*' )
 						{
-//							token.Type = TokType::Access_PointerToMemberOfPointerSymbol;
-							token.Length++;
+//							token.Type = Tok_Access_PointerToMemberOfPointerSymbol;
+							c.token.Text.Len++;
 							move_forward();
 						}
 					}
-					else if ( current == '=' )
+					else if ( (* ctx->scanner) == '=' )
 					{
-						token.Length++;
-						// token.Type = TokType::Assign_Subtract;
-						token.Flags |= TF_Assign;
+						c.token.Text.Len++;
+						// token.Type = Tok_Assign_Subtract;
+						c.token.Flags |= TF_Assign;
 
-						if (left)
+						if (c.left)
 							move_forward();
 					}
-					else while ( left && current == *(scanner - 1) && token.Length < 3 )
+					else while ( c.left && (* ctx->scanner) == *(c.scanner - 1) && c.token.Text.Len < 3 )
 					{
-						token.Length++;
+						c.token.Text.Len++;
 
-						if (left)
+						if (c.left)
 							move_forward();
 					}
 				}
@@ -6955,82 +6706,82 @@ TokArray lex( StrC content )
 			}
 			case '/':
 			{
-				token.Text   = scanner;
-				token.Length = 1;
-				token.Type   = TokType::Operator;
-				// token.Type   = TokType::Divide;
-				token.Flags  = TF_Operator;
+				Str text = { c.scanner, 1 };
+				c.token.Text   = text;
+				c.token.Type   = Tok_Operator;
+				// token.Type   = Tok_Divide;
+				c.token.Flags  = TF_Operator;
 				move_forward();
 
-				if ( left )
+				if ( c.left )
 				{
-					if ( current == '=' )
+					if ( (* ctx->scanner) == '=' )
 					{
 						// token.Type = TokeType::Assign_Divide;
 						move_forward();
-						token.Length++;
-						token.Flags = TF_Assign;
+						c.token.Text.Len++;
+						c.token.Flags = TF_Assign;
 					}
-					else if ( current == '/' )
+					else if ( (* ctx->scanner) == '/' )
 					{
-						token.Type   = TokType::Comment;
-						token.Length = 2;
-						token.Flags  = TF_Null;
+						c.token.Type     = Tok_Comment;
+						c.token.Text.Len = 2;
+						c.token.Flags    = TF_Null;
 						move_forward();
 
-						while ( left && current != '\n' && current != '\r' )
+						while ( c.left && (* ctx->scanner) != '\n' && (* ctx->scanner) != '\r' )
 						{
 							move_forward();
-							token.Length++;
+							c.token.Text.Len++;
 						}
 
-						if ( current == '\r' )
+						if ( (* ctx->scanner) == '\r' )
 						{
 							move_forward();
-							token.Length++;
+							c.token.Text.Len++;
 						}
-						if ( current == '\n' )
+						if ( (* ctx->scanner) == '\n' )
 						{
 							move_forward();
-							token.Length++;
+							c.token.Text.Len++;
 						}
-						Tokens.append( token );
+						array_append( _ctx->Lexer_Tokens, c.token );
 						continue;
 					}
-					else if ( current == '*' )
+					else if ( (* ctx->scanner) == '*' )
 					{
-						token.Type   = TokType::Comment;
-						token.Length = 2;
-						token.Flags  = TF_Null;
+						c.token.Type     = Tok_Comment;
+						c.token.Text.Len = 2;
+						c.token.Flags    = TF_Null;
 						move_forward();
 
-						bool star   = current    == '*';
-						bool slash  = scanner[1] == '/';
+						bool star   = (* ctx->scanner)    == '*';
+						bool slash  = c.scanner[1] == '/';
 						bool at_end = star && slash;
-						while ( left && ! at_end  )
+						while ( c.left && ! at_end  )
 						{
 							move_forward();
-							token.Length++;
+							c.token.Text.Len++;
 
-							star   = current    == '*';
-							slash  = scanner[1] == '/';
+							star   = (* ctx->scanner)    == '*';
+							slash  = c.scanner[1] == '/';
 							at_end = star && slash;
 						}
-						token.Length += 2;
+						c.token.Text.Len += 2;
 						move_forward();
 						move_forward();
 
-						if ( current == '\r' )
+						if ( (* ctx->scanner) == '\r' )
 						{
 							move_forward();
-							token.Length++;
+							c.token.Text.Len++;
 						}
-						if ( current == '\n' )
+						if ( (* ctx->scanner) == '\n' )
 						{
 							move_forward();
-							token.Length++;
+							c.token.Text.Len++;
 						}
-						Tokens.append( token );
+						array_append( _ctx->Lexer_Tokens, c.token );
 						// end_line();
 						continue;
 					}
@@ -7039,82 +6790,77 @@ TokArray lex( StrC content )
 			}
 		}
 
-		if ( char_is_alpha( current ) || current == '_' )
+		if ( char_is_alpha( (* ctx->scanner) ) || (* ctx->scanner) == '_' )
 		{
-			token.Text   = scanner;
-			token.Length = 1;
+			Str text = { c.scanner, 1 };
+			c.token.Text = text;
 			move_forward();
 
-			while ( left && ( char_is_alphanumeric(current) || current == '_' ) )
-			{
+			while ( c.left && ( char_is_alphanumeric((* ctx->scanner)) || (* ctx->scanner) == '_' ) ) {
 				move_forward();
-				token.Length++;
+				c.token.Text.Len++;
 			}
 
 			goto FoundToken;
 		}
-		else if ( char_is_digit(current) )
+		else if ( char_is_digit((* ctx->scanner)) )
 		{
 			// This is a very brute force lex, no checks are done for validity of literal.
 
-			token.Text   = scanner;
-			token.Length = 1;
-			token.Type   = TokType::Number;
-			token.Flags  = TF_Literal;
+			Str text = { c.scanner, 1 };
+			c.token.Text   = text;
+			c.token.Type   = Tok_Number;
+			c.token.Flags  = TF_Literal;
 			move_forward();
 
-			if (left
-			&& (	current == 'x' || current == 'X'
-				||	current == 'b' || current == 'B'
-				||  current == 'o' || current == 'O' )
+			if (c.left
+			&& (	(* ctx->scanner) == 'x' || (* ctx->scanner) == 'X'
+				||	(* ctx->scanner) == 'b' || (* ctx->scanner) == 'B'
+				||  (* ctx->scanner) == 'o' || (* ctx->scanner) == 'O' )
 			)
 			{
 				move_forward();
-				token.Length++;
+				c.token.Text.Len++;
 
-				while ( left && char_is_hex_digit(current) )
-				{
+				while ( c.left && char_is_hex_digit((* ctx->scanner)) ) {
 					move_forward();
-					token.Length++;
+					c.token.Text.Len++;
 				}
 
 				goto FoundToken;
 			}
 
-			while ( left && char_is_digit(current) )
-			{
+			while ( c.left && char_is_digit((* ctx->scanner)) ) {
 				move_forward();
-				token.Length++;
+				c.token.Text.Len++;
 			}
 
-			if ( left && current == '.' )
+			if ( c.left && (* ctx->scanner) == '.' )
 			{
 				move_forward();
-				token.Length++;
+				c.token.Text.Len++;
 
-				while ( left && char_is_digit(current) )
-				{
+				while ( c.left && char_is_digit((* ctx->scanner)) ) {
 					move_forward();
-					token.Length++;
+					c.token.Text.Len++;
 				}
 
 				// Handle number literal suffixes in a botched way
-				if (left && (
-					current == 'l' || current == 'L' ||  // long/long long
-					current == 'u' || current == 'U' ||  // unsigned
-					current == 'f' || current == 'F' ||  // float
-					current == 'i' || current == 'I' ||  // imaginary
-					current == 'z' || current == 'Z'))   // complex
+				if (c.left && (
+					(* ctx->scanner) == 'l' || (* ctx->scanner) == 'L' ||  // long/long long
+					(* ctx->scanner) == 'u' || (* ctx->scanner) == 'U' ||  // unsigned
+					(* ctx->scanner) == 'f' || (* ctx->scanner) == 'F' ||  // float
+					(* ctx->scanner) == 'i' || (* ctx->scanner) == 'I' ||  // imaginary
+					(* ctx->scanner) == 'z' || (* ctx->scanner) == 'Z'))   // complex
 				{
-					char prev = current;
+					char prev = (* ctx->scanner);
 					move_forward();
-					token.Length++;
+					c.token.Text.Len++;
 
 					// Handle 'll'/'LL' as a special case when we just processed an 'l'/'L'
-					if (left && (prev == 'l' || prev == 'L') && (current == 'l' || current == 'L'))
-					{
+					if (c.left && (prev == 'l' || prev == 'L') && ((* ctx->scanner) == 'l' || (* ctx->scanner) == 'L')) {
 						move_forward();
-						token.Length++;
+						c.token.Text.Len++;
 					}
 				}
 			}
@@ -7123,211 +6869,338 @@ TokArray lex( StrC content )
 		}
 		else
 		{
-			s32 start = max( 0, Tokens.num() - 100 );
+			s32 start = max( 0, array_num(_ctx->Lexer_Tokens) - 100 );
 			log_fmt("\n%d\n", start);
-			for ( s32 idx = start; idx < Tokens.num(); idx++ )
+			for ( s32 idx = start; idx < array_num(_ctx->Lexer_Tokens); idx++ )
 			{
 				log_fmt( "Token %d Type: %s : %.*s\n"
 					, idx
-					, ETokType::to_str( Tokens[ idx ].Type ).Ptr
-					, Tokens[ idx ].Length, Tokens[ idx ].Text
+					, toktype_to_str( _ctx->Lexer_Tokens[ idx ].Type ).Ptr
+					, _ctx->Lexer_Tokens[ idx ].Text.Len, _ctx->Lexer_Tokens[ idx ].Text.Ptr
 				);
 			}
 
-			String context_str = String::fmt_buf( GlobalAllocator, "%.*s", min( 100, left ), scanner );
-			log_failure( "Failed to lex token '%c' (%d, %d)\n%s", current, line, column, context_str );
+			StrBuilder context_str = strbuilder_fmt_buf( _ctx->Allocator_Temp, "%.*s", min( 100, c.left ), c.scanner );
+			log_failure( "Failed to lex token '%c' (%d, %d)\n%s", (* ctx->scanner), c.line, c.column, context_str );
 
 			// Skip to next whitespace since we can't know if anything else is valid until then.
-			while ( left && ! char_is_space( current ) )
-			{
+			while ( c.left && ! char_is_space( (* ctx->scanner) ) ) {
 				move_forward();
 			}
 		}
 
-	FoundToken:
-		lex_found_token( content, left, scanner, line, column, defines, token );
+		FoundToken:
+		{
+			lex_found_token( ctx );
+			TokType last_type = array_back(_ctx->Lexer_Tokens)->Type;
+			if ( last_type == Tok_Preprocess_Macro_Stmt || last_type == Tok_Preprocess_Macro_Expr )
+			{
+				Token thanks_c = { { c.scanner, 0 }, Tok_Invalid, c.line, c.column, TF_Null };
+				c.token = thanks_c;
+				if ( (* ctx->scanner) == '\r') {
+					move_forward();
+					c.token.Text.Len = 1;
+				}
+				if ( (* ctx->scanner) == '\n' ) 
+				{
+					c.token.Type = Tok_NewLine;
+					c.token.Text.Len++;
+					move_forward();
+
+					array_append( _ctx->Lexer_Tokens, c.token );
+					continue;
+				}
+			}
+		}
 	}
 
-	if ( Tokens.num() == 0 )
-	{
+	if ( array_num(_ctx->Lexer_Tokens) == 0 ) {
 		log_failure( "Failed to lex any tokens" );
-		return { { nullptr }, 0 };
+		TokArray tok_array =  {};
+		return tok_array;
 	}
 
-	defines.clear();
-	// defines_map_arena.free();
-	return { Tokens, 0 };
+	TokArray result = { _ctx->Lexer_Tokens, 0 };
+	return result;
 }
-#undef current
+
 #undef move_forward
-#undef SkipWhitespace
+#undef skip_whitespace
+#undef end_line
+// These macros are used in the swtich cases within parser.cpp
 
-// namespace parser
+#define GEN_PARSER_CLASS_STRUCT_BODY_ALLOWED_MEMBER_TOK_SPECIFIERS_CASES \
+case Tok_Spec_Consteval:              \
+case Tok_Spec_Constexpr:              \
+case Tok_Spec_Constinit:              \
+case Tok_Spec_Explicit:               \
+case Tok_Spec_ForceInline:            \
+case Tok_Spec_ForceInline_Debuggable: \
+case Tok_Spec_Inline:                 \
+case Tok_Spec_Mutable:                \
+case Tok_Spec_NeverInline:            \
+case Tok_Spec_Static:                 \
+case Tok_Spec_Volatile:               \
+case Tok_Spec_Virtual
+
+#define GEN_PARSER_CLASS_STRUCT_BODY_ALLOWED_MEMBER_SPECIFIERS_CASES \
+case Spec_Constexpr:              \
+case Spec_Constinit:              \
+case Spec_Explicit:               \
+case Spec_Inline:                 \
+case Spec_ForceInline:            \
+case Spec_ForceInline_Debuggable: \
+case Spec_Mutable:                \
+case Spec_NeverInline:            \
+case Spec_Static:                 \
+case Spec_Volatile:               \
+case Spec_Virtual
+
+#define GEN_PARSER_CLASS_GLOBAL_NSPACE_ALLOWED_MEMBER_TOK_SPECIFIER_CASES \
+case Tok_Spec_Consteval:              \
+case Tok_Spec_Constexpr:              \
+case Tok_Spec_Constinit:              \
+case Tok_Spec_Extern:                 \
+case Tok_Spec_ForceInline:            \
+case Tok_Spec_ForceInline_Debuggable: \
+case Tok_Spec_Global:                 \
+case Tok_Spec_Inline:                 \
+case Tok_Spec_Internal_Linkage:       \
+case Tok_Spec_NeverInline:            \
+case Tok_Spec_Static
+
+#define GEN_PARSER_CLASS_GLOBAL_NSPACE_ALLOWED_MEMBER_SPECIFIER_CASES \
+case Spec_Constexpr:              \
+case Spec_Constinit:              \
+case Spec_ForceInline:            \
+case Spec_ForceInline_Debuggable: \
+case Spec_Global:                 \
+case Spec_External_Linkage:       \
+case Spec_Internal_Linkage:       \
+case Spec_Inline:                 \
+case Spec_Mutable:                \
+case Spec_NeverInline:            \
+case Spec_Static:                 \
+case Spec_Volatile
+
+#define GEN_PARSER_FRIEND_ALLOWED_SPECIFIERS_CASES \
+case Spec_Const:       \
+case Spec_Inline:      \
+case Spec_ForceInline
+
+#define GEN_PARSER_FUNCTION_ALLOWED_SPECIFIERS_CASES \
+case Spec_Const:                  \
+case Spec_Consteval:              \
+case Spec_Constexpr:              \
+case Spec_External_Linkage:       \
+case Spec_Internal_Linkage:       \
+case Spec_ForceInline:            \
+case Spec_ForceInline_Debuggable: \
+case Spec_Inline:                 \
+case Spec_NeverInline:            \
+case Spec_Static
+
+#define GEN_PARSER_OPERATOR_ALLOWED_SPECIFIERS_CASES \
+case Spec_Const:       \
+case Spec_Constexpr:   \
+case Spec_ForceInline: \
+case Spec_Inline:      \
+case Spec_NeverInline: \
+case Spec_Static
+
+#define GEN_PARSER_TEMPLATE_ALLOWED_SPECIFIERS_CASES \
+case Spec_Const:                  \
+case Spec_Constexpr:              \
+case Spec_Constinit:              \
+case Spec_External_Linkage:       \
+case Spec_Global:                 \
+case Spec_Inline:                 \
+case Spec_ForceInline:            \
+case Spec_ForceInline_Debuggable: \
+case Spec_Local_Persist:          \
+case Spec_Mutable:                \
+case Spec_Static:                 \
+case Spec_Thread_Local:           \
+case Spec_Volatile
+
+#define GEN_PARSER_VARIABLE_ALLOWED_SPECIFIER_CASES \
+case Spec_Const:            \
+case Spec_Constexpr:        \
+case Spec_Constinit:        \
+case Spec_External_Linkage: \
+case Spec_Global:           \
+case Spec_Inline:           \
+case Spec_Local_Persist:    \
+case Spec_Mutable:          \
+case Spec_Static:           \
+case Spec_Thread_Local:     \
+case Spec_Volatile
+
+// TODO(Ed) : Rename ETok_Capture_Start, ETok_Capture_End to Open_Parenthesis adn Close_Parenthesis
+
+constexpr bool lex_dont_skip_formatting = false;
+constexpr bool      lex_skip_formatting = true;
+
+void parser_push( ParseContext* ctx, StackNode* node )
+{
+	node->Prev = ctx->Scope;
+	ctx->Scope = node;
+
+#if 0 && GEN_BUILD_DEBUG
+	log_fmt("\tEntering _ctx->parser: %.*s\n", Scope->ProcName.Len, Scope->ProcName.Ptr );
+#endif
 }
 
-namespace parser {
-
-// TODO(Ed) : Rename ETokType::Capture_Start, ETokType::Capture_End to Open_Parenthesis adn Close_Parenthesis
-
-constexpr bool dont_skip_formatting = false;
-
-struct StackNode
+void parser_pop(ParseContext* ctx)
 {
-	StackNode* Prev;
+#if 0 && GEN_BUILD_DEBUG
+	log_fmt("\tPopping  _ctx->parser: %.*s\n", Scope->ProcName.Len, Scope->ProcName.Ptr );
+#endif
+	ctx->Scope = ctx->Scope->Prev;
+}
 
-	Token Start;
-	Token Name;        // The name of the AST node (if parsed)
-	StrC  ProcName;    // The name of the procedure
-};
-
-struct ParseContext
+StrBuilder parser_to_strbuilder(ParseContext ctx)
 {
-	TokArray   Tokens;
-	StackNode* Scope;
+	StrBuilder result = strbuilder_make_reserve( _ctx->Allocator_Temp, kilobytes(4) );
 
-	void push( StackNode* node )
+	Token scope_start = * ctx.Scope->Start;
+	Token last_valid  = ctx.Tokens.Idx >= array_num(ctx.Tokens.Arr) ? ctx.Tokens.Arr[array_num(ctx.Tokens.Arr) -1] : (* lex_current(& ctx.Tokens, true));
+
+	sptr        length  = scope_start.Text.Len;
+	char const* current = scope_start.Text.Ptr + length;
+	while ( current <= array_back( ctx.Tokens.Arr)->Text.Ptr && (* current) != '\n' && length < 74 )
 	{
-		node->Prev = Scope;
-		Scope      = node;
-
-	#if 0 && Build_Debug
-		log_fmt("\tEntering Context: %.*s\n", Scope->ProcName.Len, Scope->ProcName.Ptr );
-	#endif
+		current++;
+		length++;
 	}
 
-	void pop()
+	Str scope_str = { scope_start.Text.Ptr, length };
+	StrBuilder line = strbuilder_make_str( _ctx->Allocator_Temp, scope_str );
+	strbuilder_append_fmt( & result, "\tScope    : %s\n", line );
+	strbuilder_free(& line);
+
+	sptr   dist            = (sptr)last_valid.Text.Ptr - (sptr)scope_start.Text.Ptr + 2;
+	sptr   length_from_err = dist;
+
+	Str err_str        = { last_valid.Text.Ptr, length_from_err };
+	StrBuilder line_from_err = strbuilder_make_str( _ctx->Allocator_Temp, err_str );
+
+	if ( length_from_err < 100 )
+		strbuilder_append_fmt(& result, "\t(%d, %d):%*c\n", last_valid.Line, last_valid.Column, length_from_err, '^' );
+	else
+		strbuilder_append_fmt(& result, "\t(%d, %d)\n", last_valid.Line, last_valid.Column );
+
+	StackNode* curr_scope = ctx.Scope;
+	s32 level = 0;
+	do
 	{
-	#if 0 && Build_Debug
-		log_fmt("\tPopping  Context: %.*s\n", Scope->ProcName.Len, Scope->ProcName.Ptr );
-	#endif
-		Scope = Scope->Prev;
-	}
-
-	String to_string()
-	{
-		String result = String::make_reserve( GlobalAllocator, kilobytes(4) );
-
-		Token scope_start = Scope->Start;
-		Token last_valid  = Tokens.Idx >= Tokens.Arr.num() ? Tokens.Arr[Tokens.Arr.num() -1] : Tokens.current();
-
-		sptr        length  = scope_start.Length;
-		char const* current = scope_start.Text + length;
-		while ( current <= Tokens.Arr.back().Text && *current != '\n' && length < 74 )
-		{
-			current++;
-			length++;
+		if ( curr_scope->Name.Ptr ) {
+			strbuilder_append_fmt(& result, "\t%d: %s, AST Name: %.*s\n", level, curr_scope->ProcName.Ptr, curr_scope->Name.Len, curr_scope->Name.Ptr );
+		}
+		else {
+			strbuilder_append_fmt(& result, "\t%d: %s\n", level, curr_scope->ProcName.Ptr );
 		}
 
-		String line = String::make( GlobalAllocator, { length, scope_start.Text } );
-		result.append_fmt("\tScope    : %s\n", line );
-		line.free();
-
-		sptr   dist            = (sptr)last_valid.Text - (sptr)scope_start.Text + 2;
-		sptr   length_from_err = dist;
-		String line_from_err   = String::make( GlobalAllocator, { length_from_err, last_valid.Text } );
-
-		if ( length_from_err < 100 )
-			result.append_fmt("\t(%d, %d):%*c\n", last_valid.Line, last_valid.Column, length_from_err, '^' );
-		else
-			result.append_fmt("\t(%d, %d)\n", last_valid.Line, last_valid.Column );
-
-		StackNode* curr_scope = Scope;
-		s32 level = 0;
-		do
-		{
-			if ( curr_scope->Name )
-			{
-				result.append_fmt("\t%d: %s, AST Name: %.*s\n", level, curr_scope->ProcName.Ptr, curr_scope->Name.Length, curr_scope->Name.Text );
-			}
-			else
-			{
-				result.append_fmt("\t%d: %s\n", level, curr_scope->ProcName.Ptr );
-			}
-
-			curr_scope = curr_scope->Prev;
-			level++;
-		}
-		while ( curr_scope );
-		return result;
+		curr_scope = curr_scope->Prev;
+		level++;
 	}
-};
+	while ( curr_scope );
+	return result;
+}
 
-global ParseContext Context;
-
-bool TokArray::__eat( TokType type )
+bool lex__eat(TokArray* self, TokType type )
 {
-	if ( Arr.num() - Idx <= 0 )
-	{
-		log_failure( "No tokens left.\n%s", Context.to_string() );
+	if ( array_num(self->Arr) - self->Idx <= 0 ) {
+		log_failure( "No tokens left.\n%s", parser_to_strbuilder(_ctx->parser) );
 		return false;
 	}
 
-	if ( ( Arr[ Idx ].Type == TokType::NewLine && type != TokType::NewLine )
-	||   ( Arr[ Idx ].Type == TokType::Comment && type != TokType::Comment ) )
+	Token at_idx = self->Arr[ self->Idx ];
+
+	if ( ( at_idx.Type == Tok_NewLine && type != Tok_NewLine )
+	||   ( at_idx.Type == Tok_Comment && type != Tok_Comment ) )
 	{
-		Idx++;
+		self->Idx ++;
 	}
 
-	if ( Arr[Idx].Type != type )
+	b32 not_accepted  = at_idx.Type != type;
+	b32 is_identifier = at_idx.Type == Tok_Identifier;
+	if ( not_accepted )
 	{
+		Macro* macro = lookup_macro(at_idx.Text);
+		b32 accept_as_identifier = macro && bitfield_is_set(MacroFlags, macro->Flags, MF_Allow_As_Identifier );
+		not_accepted             = type == Tok_Identifier && accept_as_identifier ? false : true;
+	}
+	if ( not_accepted )
+	{
+		Token tok = * lex_current( self, lex_skip_formatting );
 		log_failure( "Parse Error, TokArray::eat, Expected: ' %s ' not ' %.*s ' (%d, %d)`\n%s"
-			, ETokType::to_str(type).Ptr
-			, Arr[Idx].Length, Arr[Idx].Text
-			, current().Line
-			, current().Column
-			, Context.to_string()
+			, toktype_to_str(type).Ptr
+			, at_idx.Text.Len, at_idx.Text.Ptr
+			, tok.Line
+			, tok.Column
+			, parser_to_strbuilder(_ctx->parser)
 		);
-
+		GEN_DEBUG_TRAP();
 		return false;
 	}
 
-#if 0 && Build_Debug
-	log_fmt("Ate: %S\n", Arr[Idx].to_string() );
+#if 0 && GEN_BUILD_DEBUG
+	log_fmt("Ate: %SB\n", self->Arr[Idx].to_strbuilder() );
 #endif
 
-	Idx++;
+	self->Idx ++;
 	return true;
 }
 
 internal
-void init()
+void parser_init()
 {
-	Tokens = Array<Token>::init_reserve( LexArena
-		, ( LexAllocator_Size - sizeof( Array<Token>::Header ) ) / sizeof(Token)
-	);
-
-	defines_map_arena = Arena_256KB::init();
-	defines           = HashTable<StrC>::init_reserve( defines_map_arena, 256 );
+	_ctx->Lexer_Tokens = array_init_reserve(Token, _ctx->Allocator_DyanmicContainers, _ctx->InitSize_LexerTokens );
 }
 
 internal
-void deinit()
+void parser_deinit()
 {
-	parser::Tokens = { nullptr };
+	Array(Token) null_array = { nullptr };
+	_ctx->Lexer_Tokens = null_array;
 }
 
 #pragma region Helper Macros
 
-#	define check_parse_args( def )                                             \
-if ( def.Len <= 0 )                                                            \
-{                                                                              \
-	log_failure( "gen::" stringize(__func__) ": length must greater than 0" ); \
-	parser::Context.pop();                                                     \
-	return CodeInvalid;                                                        \
-}                                                                              \
-if ( def.Ptr == nullptr )                                                      \
-{                                                                              \
-	log_failure( "gen::" stringize(__func__) ": def was null" );               \
-	parser::Context.pop();                                                     \
-	return CodeInvalid;                                                        \
+#define check_parse_args( def ) _check_parse_args(def, stringize(_func_) )
+bool _check_parse_args( Str def, char const* func_name )
+{
+	if ( def.Len <= 0 )
+	{
+		log_failure( c_str_fmt_buf("gen::%s: length must greater than 0", func_name) );
+		parser_pop(& _ctx->parser);
+		return false;
+	}
+	if ( def.Ptr == nullptr )
+	{
+		log_failure( c_str_fmt_buf("gen::%s: def was null", func_name) );
+		parser_pop(& _ctx->parser);
+		return false;
+	}
+	return true;
 }
 
-#	define currtok_noskip Context.Tokens.current( dont_skip_formatting )
-#	define currtok        Context.Tokens.current()
-#	define prevtok        Context.Tokens.previous()
-#	define nexttok		  Context.Tokens.next()
-#	define eat( Type_ )   Context.Tokens.__eat( Type_ )
-#	define left           ( Context.Tokens.Arr.num() - Context.Tokens.Idx )
+#	define currtok_noskip (* lex_current( &  _ctx->parser.Tokens, lex_dont_skip_formatting ))
+#	define currtok        (* lex_current( & _ctx->parser.Tokens, lex_skip_formatting ))
+#	define peektok        (* lex_peek(_ctx->parser.Tokens, lex_skip_formatting))
+#	define prevtok        (* lex_previous( _ctx->parser.Tokens, lex_dont_skip_formatting))
+#	define nexttok		  (* lex_next( _ctx->parser.Tokens, lex_skip_formatting ))
+#	define nexttok_noskip (* lex_next( _ctx->parser.Tokens, lex_dont_skip_formatting))
+#	define eat( Type_ )   lex__eat( & _ctx->parser.Tokens, Type_ )
+#	define left           ( array_num(_ctx->parser.Tokens.Arr) - _ctx->parser.Tokens.Idx )
+
+#if GEN_COMPILER_CPP
+#	define def_assign( ... ) { __VA_ARGS__ }
+#else
+#	define def_assign( ... ) __VA_ARGS__
+#endif
+
 
 #ifdef check
 #define CHECK_WAS_DEFINED
@@ -7336,11 +7209,12 @@ if ( def.Ptr == nullptr )                                                      \
 #endif
 
 #	define check_noskip( Type_ ) ( left && currtok_noskip.Type == Type_ )
-#	define check( Type_ )        ( left && currtok.Type == Type_ )
+#	define check( Type_ )        ( left && currtok.Type        == Type_ )
 
-#	define push_scope()                                               \
-	StackNode scope { nullptr, currtok_noskip, NullToken, txt( __func__ ) }; \
-	Context.push( & scope )
+#	define push_scope()                                                                                                         \
+	Str null_name = {};                                                                                                         \
+	StackNode scope = { nullptr, lex_current( &  _ctx->parser.Tokens, lex_dont_skip_formatting ), null_name, txt( __func__ ) }; \
+	parser_push( & _ctx->parser, & scope )
 
 #pragma endregion Helper Macros
 
@@ -7350,75 +7224,81 @@ internal Code               parse_array_decl                   ();
 internal CodeAttributes     parse_attributes                   ();
 internal CodeComment        parse_comment                      ();
 internal Code               parse_complicated_definition       ( TokType which );
-internal CodeBody           parse_class_struct_body            ( TokType which, Token name = NullToken );
+internal CodeBody           parse_class_struct_body            ( TokType which, Token name );
 internal Code               parse_class_struct                 ( TokType which, bool inplace_def );
-internal CodeDefine         parse_define                       ();
 internal Code               parse_expression                   ();
 internal Code               parse_forward_or_definition        ( TokType which, bool is_inplace );
-internal CodeFn             parse_function_after_name          ( ModuleFlag mflags, CodeAttributes attributes, CodeSpecifiers specifiers, CodeType ret_type, Token name );
+internal CodeFn             parse_function_after_name          ( ModuleFlag mflags, CodeAttributes attributes, CodeSpecifiers specifiers, CodeTypename ret_type, Token name );
 internal Code               parse_function_body                ();
-internal Code               parse_global_nspace                ();
+internal CodeBody           parse_global_nspace                ( CodeType which );
 internal Code               parse_global_nspace_constructor_destructor( CodeSpecifiers specifiers );
-internal Token              parse_identifier                   ( bool* possible_member_function = nullptr );
+internal Token              parse_identifier                   ( bool* possible_member_function );
 internal CodeInclude        parse_include                      ();
-internal CodeOperator       parse_operator_after_ret_type      ( ModuleFlag mflags, CodeAttributes attributes, CodeSpecifiers specifiers, CodeType ret_type );
+internal Code               parse_macro_as_definiton           ( CodeAttributes attributes, CodeSpecifiers specifiers );
+internal CodeOperator       parse_operator_after_ret_type      ( ModuleFlag mflags, CodeAttributes attributes, CodeSpecifiers specifiers, CodeTypename ret_type );
 internal Code               parse_operator_function_or_variable( bool expects_function, CodeAttributes attributes, CodeSpecifiers specifiers );
 internal CodePragma         parse_pragma                       ();
-internal CodeParam          parse_params                       ( bool use_template_capture = false );
+internal CodeParams         parse_params                       ( bool use_template_capture );
 internal CodePreprocessCond parse_preprocess_cond              ();
-internal Code               parse_simple_preprocess            ( TokType which );
+internal Code               parse_simple_preprocess            ( TokType which  );
 internal Code               parse_static_assert                ();
-internal void               parse_template_args                ( Token& token );
-internal CodeVar            parse_variable_after_name          ( ModuleFlag mflags, CodeAttributes attributes, CodeSpecifiers specifiers, CodeType type, StrC name );
+internal void               parse_template_args                ( Token* token );
+internal CodeVar            parse_variable_after_name          ( ModuleFlag mflags, CodeAttributes attributes, CodeSpecifiers specifiers, CodeTypename type, Str name );
 internal CodeVar            parse_variable_declaration_list    ();
 
-internal CodeClass       parse_class           ( bool inplace_def = false );
-internal CodeConstructor parse_constructor     ( CodeSpecifiers specifiers );
-internal CodeDestructor  parse_destructor      ( CodeSpecifiers specifiers = NoCode );
-internal CodeEnum        parse_enum            ( bool inplace_def = false );
-internal CodeBody        parse_export_body     ();
-internal CodeBody        parse_extern_link_body();
-internal CodeExtern      parse_extern_link     ();
-internal CodeFriend      parse_friend          ();
-internal CodeFn          parse_function        ();
-internal CodeNS          parse_namespace       ();
-internal CodeOpCast      parse_operator_cast   ( CodeSpecifiers specifiers = NoCode );
-internal CodeStruct      parse_struct          ( bool inplace_def = false );
-internal CodeVar         parse_variable        ();
-internal CodeTemplate    parse_template        ();
-internal CodeType        parse_type            ( bool from_template = false, bool* is_function = nullptr );
-internal CodeTypedef     parse_typedef         ();
-internal CodeUnion       parse_union           ( bool inplace_def = false );
-internal CodeUsing       parse_using           ();
+internal CodeClass       parser_parse_class           ( bool inplace_def );
+internal CodeConstructor parser_parse_constructor     ( CodeSpecifiers specifiers );
+internal CodeDefine      parser_parse_define          ();
+internal CodeDestructor  parser_parse_destructor      ( CodeSpecifiers specifiers );
+internal CodeEnum        parser_parse_enum            ( bool inplace_def );
+internal CodeBody        parser_parse_export_body     ();
+internal CodeBody        parser_parse_extern_link_body();
+internal CodeExtern      parser_parse_extern_link     ();
+internal CodeFriend      parser_parse_friend          ();
+internal CodeFn          parser_parse_function        ();
+internal CodeNS          parser_parse_namespace       ();
+internal CodeOpCast      parser_parse_operator_cast   ( CodeSpecifiers specifiers );
+internal CodeStruct      parser_parse_struct          ( bool inplace_def );
+internal CodeVar         parser_parse_variable        ();
+internal CodeTemplate    parser_parse_template        ();
+internal CodeTypename    parser_parse_type            ( bool from_template, bool* is_function );
+internal CodeTypedef     parser_parse_typedef         ();
+internal CodeUnion       parser_parse_union           ( bool inplace_def );
+internal CodeUsing       parser_parse_using           ();
 
-constexpr bool inplace_def = true;
+constexpr bool parser_inplace_def         = true;
+constexpr bool parser_not_inplace_def     = false;
+constexpr bool parser_dont_consume_braces = true;
+constexpr bool parser_consume_braces      = false;
+constexpr bool parser_not_from_template   = false;
+
+constexpr bool parser_use_parenthesis = false;
 
 // Internal parsing functions
 
-constexpr bool strip_formatting_dont_preserve_newlines = false;
+constexpr bool parser_strip_formatting_dont_preserve_newlines = false;
 /*
 	This function was an attempt at stripping formatting from any c++ code.
 	It has edge case failures that prevent it from being used in function bodies.
 */
 internal
-String strip_formatting( StrC raw_text, bool preserve_newlines = true )
+StrBuilder parser_strip_formatting( Str raw_text, bool preserve_newlines )
 {
-	String content = String::make_reserve( GlobalAllocator, raw_text.Len );
+	StrBuilder content = strbuilder_make_reserve( _ctx->Allocator_Temp, raw_text.Len );
 
 	if ( raw_text.Len == 0 )
 		return content;
 
 #define cut_length ( scanner - raw_text.Ptr - last_cut )
 #define cut_ptr    ( raw_text.Ptr   + last_cut )
-#define pos        ( sptr( scanner ) - sptr( raw_text.Ptr ) )
+#define pos        ( rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr ) )
 #define move_fwd() do { scanner++; tokleft--; } while(0)
 
 	s32         tokleft  = raw_text.Len;
 	sptr        last_cut = 0;
 	char const* scanner  = raw_text.Ptr;
 
-	if ( scanner[0] == ' ' )
-	{
+	if ( scanner[0] == ' ' ) {
 		move_fwd();
 		last_cut = 1;
 	}
@@ -7450,8 +7330,8 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 			if ( tokleft )
 				move_fwd();
 
-			content.append( cut_ptr, cut_length );
-			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
+			strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
+			last_cut = rcast(sptr, scanner ) - rcast( sptr, raw_text.Ptr );
 			continue;
 		}
 
@@ -7472,8 +7352,8 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 			if ( tokleft )
 				move_fwd();
 
-			content.append( cut_ptr, cut_length );
-			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
+			strbuilder_append_c_str_len( & content, cut_ptr, cut_length );
+			last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
 			continue;
 		}
 
@@ -7486,8 +7366,8 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 			scanner += 2;
 			tokleft -= 2;
 
-			content.append( cut_ptr, cut_length );
-			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
+			strbuilder_append_c_str_len( & content,  cut_ptr, cut_length );
+			last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
 			continue;
 		}
 
@@ -7505,8 +7385,8 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 			if (tokleft)
 				move_fwd();
 
-			content.append( cut_ptr, cut_length );
-			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
+			strbuilder_append_c_str_len( & content,  cut_ptr, cut_length );
+			last_cut = rcast( sptr,  scanner ) - rcast( sptr, raw_text.Ptr );
 			continue;
 		}
 
@@ -7514,13 +7394,13 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 		if (scanner[0] == '\t')
 		{
 			if (pos > last_cut)
-				content.append(cut_ptr, cut_length);
+				strbuilder_append_c_str_len( & content, cut_ptr, cut_length);
 
-			if ( content.back() != ' ' )
-				content.append(' ');
+			if ( * strbuilder_back( content ) != ' ' )
+				strbuilder_append_char( & content, ' ' );
 
 			move_fwd();
-			last_cut = sptr(scanner) - sptr(raw_text.Ptr);
+			last_cut = rcast( sptr, scanner) - rcast( sptr, raw_text.Ptr);
 			continue;
 		}
 
@@ -7533,22 +7413,22 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 				scanner += 2;
 				tokleft -= 2;
 
-				content.append( cut_ptr, cut_length );
-				last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
+				strbuilder_append_c_str_len( & content,  cut_ptr, cut_length );
+				last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
 				continue;
 			}
 
 			if ( pos > last_cut )
-				content.append( cut_ptr, cut_length );
+				strbuilder_append_c_str_len( & content,  cut_ptr, cut_length );
 
 			// Replace with a space
-			if ( content.back() != ' ' )
-				content.append( ' ' );
+			if ( * strbuilder_back( content ) != ' ' )
+				strbuilder_append_char( & content,  ' ' );
 
 			scanner += 2;
 			tokleft -= 2;
 
-			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
+			last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
 			continue;
 		}
 
@@ -7560,28 +7440,28 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 
 				move_fwd();
 
-				content.append( cut_ptr, cut_length );
-				last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
+				strbuilder_append_c_str_len( & content,  cut_ptr, cut_length );
+				last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
 				continue;
 			}
 
 			if ( pos > last_cut )
-				content.append( cut_ptr, cut_length );
+				strbuilder_append_c_str_len( & content,  cut_ptr, cut_length );
 
 			// Replace with a space
-			if ( content.back() != ' ' )
-				content.append( ' ' );
+			if ( * strbuilder_back( content ) != ' ' )
+				strbuilder_append_char( & content,  ' ' );
 
 			move_fwd();
 
-			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
+			last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
 			continue;
 		}
 
 		// Escaped newlines
 		if ( scanner[0] == '\\' )
 		{
-			content.append( cut_ptr, cut_length );
+			strbuilder_append_c_str_len( & content,  cut_ptr, cut_length );
 
 			s32 amount_to_skip = 1;
 			if ( tokleft > 1 && scanner[1] == '\n' )
@@ -7601,25 +7481,26 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 			else
 				move_fwd();
 
-			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
+			last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
 			continue;
 		}
 
 		// Consectuive spaces
 		if ( tokleft > 1 && char_is_space( scanner[0] ) && char_is_space( scanner[ 1 ] ) )
 		{
-			content.append( cut_ptr, cut_length );
+			strbuilder_append_c_str_len( & content,  cut_ptr, cut_length );
 			do
 			{
 				move_fwd();
 			}
 			while ( tokleft && char_is_space( scanner[0] ) );
 
-			last_cut = sptr( scanner ) - sptr( raw_text.Ptr );
+			last_cut = rcast( sptr, scanner ) - rcast( sptr, raw_text.Ptr );
 
 			// Preserve only 1 space of formattting
-			if ( content.back() != ' ' )
-				content.append( ' ' );
+			char* last = strbuilder_back(content);
+			if ( last == nullptr || * last != ' ' )
+				strbuilder_append_char( & content, ' ' );
 
 			continue;
 		}
@@ -7627,9 +7508,8 @@ String strip_formatting( StrC raw_text, bool preserve_newlines = true )
 		move_fwd();
 	}
 
-	if ( last_cut < raw_text.Len )
-	{
-		content.append( cut_ptr, raw_text.Len - last_cut );
+	if ( last_cut < raw_text.Len ) {
+		strbuilder_append_c_str_len( & content,  cut_ptr, raw_text.Len - last_cut );
 	}
 
 #undef cut_ptr
@@ -7645,79 +7525,79 @@ Code parse_array_decl()
 {
 	push_scope();
 
-	if ( check( TokType::Operator ) && currtok.Text[0] == '[' && currtok.Text[1] == ']' )
+	if ( check( Tok_Operator ) && currtok.Text.Ptr[0] == '[' && currtok.Text.Ptr[1] == ']' )
 	{
-		Code array_expr = untyped_str( currtok );
-		eat( TokType::Operator );
+		Code array_expr = untyped_str( txt(" ") );
+		eat( Tok_Operator );
 		// []
 
-		Context.pop();
+		parser_pop(& _ctx->parser);
 		return array_expr;
 	}
 
-	if ( check( TokType::BraceSquare_Open ) )
+	if ( check( Tok_BraceSquare_Open ) )
 	{
-		eat( TokType::BraceSquare_Open );
+		eat( Tok_BraceSquare_Open );
 		// [
 
 		if ( left == 0 )
 		{
-			log_failure( "Error, unexpected end of array declaration ( '[]' scope started )\n%s", Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "Error, unexpected end of array declaration ( '[]' scope started )\n%s", parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 
-		if ( currtok.Type == TokType::BraceSquare_Close )
+		if ( currtok.Type == Tok_BraceSquare_Close )
 		{
-			log_failure( "Error, empty array expression in definition\n%s", Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "Error, empty array expression in definition\n%s", parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 
 		Token untyped_tok = currtok;
 
-		while ( left && currtok.Type != TokType::BraceSquare_Close )
+		while ( left && currtok.Type != Tok_BraceSquare_Close )
 		{
 			eat( currtok.Type );
 		}
 
-		untyped_tok.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)untyped_tok.Text;
+		untyped_tok.Text.Len = ( (sptr)prevtok.Text.Ptr + prevtok.Text.Len ) - (sptr)untyped_tok.Text.Ptr;
 
-		Code array_expr = untyped_str( untyped_tok );
+		Code array_expr = untyped_str( tok_to_str(untyped_tok) );
 		// [ <Content>
 
 		if ( left == 0 )
 		{
-			log_failure( "Error, unexpected end of array declaration, expected ]\n%s", Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "Error, unexpected end of array declaration, expected ]\n%s", parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 
-		if ( currtok.Type != TokType::BraceSquare_Close )
+		if ( currtok.Type != Tok_BraceSquare_Close )
 		{
-			log_failure( "%s: Error, expected ] in array declaration, not %s\n%s", ETokType::to_str( currtok.Type ), Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "%s: Error, expected ] in array declaration, not %s\n%s", toktype_to_str( currtok.Type ), parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 
-		eat( TokType::BraceSquare_Close );
+		eat( Tok_BraceSquare_Close );
 		// [ <Content> ]
 
 		// Its a multi-dimensional array
-		if ( check( TokType::BraceSquare_Open ))
+		if ( check( Tok_BraceSquare_Open ))
 		{
 			Code adjacent_arr_expr = parse_array_decl();
 			// [ <Content> ][ <Content> ]...
 
-			array_expr->Next = adjacent_arr_expr.ast;
+			array_expr->Next = adjacent_arr_expr;
 		}
 
-		Context.pop();
+		parser_pop(& _ctx->parser);
 		return array_expr;
 	}
 
-	Context.pop();
-	return { nullptr };
+	parser_pop(& _ctx->parser);
+	return NullCode;
 }
 
 internal inline
@@ -7729,131 +7609,129 @@ CodeAttributes parse_attributes()
 	s32   len   = 0;
 
 	// There can be more than one attribute. If there is flatten them to a single string.
-	// TODO(Ed): Support keeping an linked list of attributes similar to parameters
-	while ( left && currtok.is_attribute() )
+	// TODO(Ed): Support chaining attributes (Use parameter linkage pattern)
+	while ( left && tok_is_attribute(currtok) )
 	{
-		if ( check( TokType::Attribute_Open ) )
+		if ( check( Tok_Attribute_Open ) )
 		{
-			eat( TokType::Attribute_Open );
+			eat( Tok_Attribute_Open );
 			// [[
 
-			while ( left && currtok.Type != TokType::Attribute_Close )
+			while ( left && currtok.Type != Tok_Attribute_Close )
 			{
 				eat( currtok.Type );
 			}
 			// [[ <Content>
 
-			eat( TokType::Attribute_Close );
+			eat( Tok_Attribute_Close );
 			// [[ <Content> ]]
 
-			len = ( ( sptr )prevtok.Text + prevtok.Length ) - ( sptr )start.Text;
+			len = ( ( sptr )prevtok.Text.Ptr + prevtok.Text.Len ) - ( sptr )start.Text.Ptr;
 		}
-		else if ( check( TokType::Decl_GNU_Attribute ) )
+		else if ( check( Tok_Decl_GNU_Attribute ) )
 		{
-			eat( TokType::Decl_GNU_Attribute );
-			eat( TokType::Capture_Start );
-			eat( TokType::Capture_Start );
+			eat( Tok_Decl_GNU_Attribute );
+			eat( Tok_Capture_Start );
+			eat( Tok_Capture_Start );
 			// __attribute__((
 
-			while ( left && currtok.Type != TokType::Capture_End )
+			while ( left && currtok.Type != Tok_Capture_End )
 			{
 				eat( currtok.Type );
 			}
 			// __attribute__(( <Content>
 
-			eat( TokType::Capture_End );
-			eat( TokType::Capture_End );
+			eat( Tok_Capture_End );
+			eat( Tok_Capture_End );
 			// __attribute__(( <Content> ))
 
-			len = ( ( sptr )prevtok.Text + prevtok.Length ) - ( sptr )start.Text;
+			len = ( ( sptr )prevtok.Text.Ptr + prevtok.Text.Len ) - ( sptr )start.Text.Ptr;
 		}
-		else if ( check( TokType::Decl_MSVC_Attribute ) )
+		else if ( check( Tok_Decl_MSVC_Attribute ) )
 		{
-			eat( TokType::Decl_MSVC_Attribute );
-			eat( TokType::Capture_Start );
+			eat( Tok_Decl_MSVC_Attribute );
+			eat( Tok_Capture_Start );
 			// __declspec(
 
-			while ( left && currtok.Type != TokType::Capture_End )
+			while ( left && currtok.Type != Tok_Capture_End )
 			{
 				eat( currtok.Type );
 			}
 			// __declspec( <Content>
 
-			eat( TokType::Capture_End );
+			eat( Tok_Capture_End );
 			// __declspec( <Content> )
 
-			len = ( ( sptr )prevtok.Text + prevtok.Length ) - ( sptr )start.Text;
+			len = ( ( sptr )prevtok.Text.Ptr + prevtok.Text.Len ) - ( sptr )start.Text.Ptr;
 		}
-		else if ( currtok.is_attribute() )
+		else if ( tok_is_attribute(currtok) )
 		{
 			eat( currtok.Type );
 			// <Attribute>
 
 			// If its a macro based attribute, this could be a functional macro such as Unreal's UE_DEPRECATED(...)
-			if ( check( TokType::Capture_Start))
+			if ( check( Tok_Capture_Start))
 			{
-				eat( TokType::Capture_Start );
+				eat( Tok_Capture_Start );
 
 				s32 level = 0;
-				while (left && currtok.Type != TokType::Capture_End && level == 0)
+				while (left && currtok.Type != Tok_Capture_End && level == 0)
 				{
-					if (currtok.Type == TokType::Capture_Start)
+					if (currtok.Type == Tok_Capture_Start)
 						++ level;
-					if (currtok.Type == TokType::Capture_End)
+					if (currtok.Type == Tok_Capture_End)
 						--level;
 					eat(currtok.Type);
 				}
-				eat(TokType::Capture_End);
+				eat(Tok_Capture_End);
 			}
 
-			len = ( ( sptr )prevtok.Text + prevtok.Length ) - ( sptr )start.Text;
+			len = ( ( sptr )prevtok.Text.Ptr + prevtok.Text.Len ) - ( sptr )start.Text.Ptr;
 			// <Attribute> ( ... )
 		}
 	}
 
 	if ( len > 0 )
 	{
-		StrC attribute_txt = { len, start.Text };
-		Context.pop();
+		Str attribute_txt = { start.Text.Ptr, len };
+		parser_pop(& _ctx->parser);
 
-		String name_stripped = strip_formatting( attribute_txt, strip_formatting_dont_preserve_newlines );
+		StrBuilder name_stripped = parser_strip_formatting( attribute_txt, parser_strip_formatting_dont_preserve_newlines );
 
 		Code result     = make_code();
-		result->Type    = ECode::PlatformAttributes;
-		result->Name    = get_cached_string( name_stripped );
+		result->Type    = CT_PlatformAttributes;
+		result->Name    = cache_str( strbuilder_to_str(name_stripped) );
 		result->Content = result->Name;
 		// result->Token   =
 
 		return ( CodeAttributes )result;
 	}
 
-	Context.pop();
-	return { nullptr };
+	parser_pop(& _ctx->parser);
+	return NullCode;
 }
 
 internal
-Code parse_class_struct( TokType which, bool inplace_def = false )
+Code parse_class_struct( TokType which, bool inplace_def )
 {
-	if ( which != TokType::Decl_Class && which != TokType::Decl_Struct )
-	{
-		log_failure( "Error, expected class or struct, not %s\n%s", ETokType::to_str( which ), Context.to_string() );
-		return CodeInvalid;
+	if ( which != Tok_Decl_Class && which != Tok_Decl_Struct ) {
+		log_failure( "Error, expected class or struct, not %s\n%s", toktype_to_str( which ), parser_to_strbuilder(_ctx->parser) );
+		return InvalidCode;
 	}
 
-	Token name { nullptr, 0, TokType::Invalid };
+	Token name = NullToken;
 
-	AccessSpec     access     = AccessSpec::Default;
-	CodeType       parent     = { nullptr };
+	AccessSpec     access     = AccessSpec_Default;
+	CodeTypename   parent     = { nullptr };
 	CodeBody       body       = { nullptr };
 	CodeAttributes attributes = { nullptr };
-	ModuleFlag     mflags     = ModuleFlag::None;
+	ModuleFlag     mflags     = ModuleFlag_None;
 
-	CodeClass result = CodeInvalid;
+	Code result = InvalidCode;
 
-	if ( check(TokType::Module_Export) )
-	{
-		mflags = ModuleFlag::Export;
-		eat( TokType::Module_Export );
+	if ( check(Tok_Module_Export) ) {
+		mflags = ModuleFlag_Export;
+		eat( Tok_Module_Export );
 	}
 	// <ModuleFlags>
 
@@ -7863,261 +7741,275 @@ Code parse_class_struct( TokType which, bool inplace_def = false )
 	attributes = parse_attributes();
 	// <ModuleFlags> <class/struct> <Attributes>
 
-	if ( check( TokType::Identifier ) )
-	{
-		name = parse_identifier();
-		Context.Scope->Name = name;
+	if ( check( Tok_Identifier ) ) {
+		name = parse_identifier(nullptr);
+		_ctx->parser.Scope->Name = name.Text;
 	}
 	// <ModuleFlags> <class/struct> <Attributes> <Name>
 
 	local_persist
-	char interface_arr_mem[ kilobytes(4) ] {0};
-	Array<CodeType> interfaces = Array<CodeType>::init_reserve( Arena::init_from_memory(interface_arr_mem, kilobytes(4) ), 4 );
+	char interface_arr_mem[ kilobytes(4) ] = {0};
+	Array(CodeTypename) interfaces; {
+		Arena arena = arena_init_from_memory( interface_arr_mem, kilobytes(4) );
+		interfaces  = array_init_reserve(CodeTypename, arena_allocator_info(& arena), 4 );
+	}
 
 	// TODO(Ed) : Make an AST_DerivedType, we'll store any arbitary derived type into there as a linear linked list of them.
-	if ( check( TokType::Assign_Classifer ) )
+	if ( check( Tok_Assign_Classifer ) )
 	{
-		eat( TokType::Assign_Classifer );
+		eat( Tok_Assign_Classifer );
 		// <ModuleFlags> <class/struct> <Attributes> <Name> :
 
-		if ( currtok.is_access_specifier() )
-		{
-			access = currtok.to_access_specifier();
+		if ( tok_is_access_specifier(currtok) ) {
+			access = tok_to_access_specifier(currtok);
 			// <ModuleFlags> <class/struct> <Attributes> <Name> : <Access Specifier>
 			eat( currtok.Type );
 		}
 
-		Token parent_tok = parse_identifier();
-		parent = def_type( parent_tok );
+		Token parent_tok = parse_identifier(nullptr);
+		parent = def_type( tok_to_str(parent_tok) );
 		// <ModuleFlags> <class/struct> <Attributes> <Name> : <Access Specifier> <Parent/Interface Name>
 
-		while ( check(TokType::Comma) )
+		while ( check(Tok_Comma) )
 		{
-			eat( TokType::Comma );
+			eat( Tok_Comma );
 			// <ModuleFlags> <class/struct> <Attributes> <Name> : <Access Specifier> <Name>,
 
-			if ( currtok.is_access_specifier() )
-			{
+			if ( tok_is_access_specifier(currtok) ) {
 				eat(currtok.Type);
 			}
-			Token interface_tok = parse_identifier();
+			Token interface_tok = parse_identifier(nullptr);
 
-			interfaces.append( def_type( interface_tok ) );
+			array_append( interfaces, def_type( tok_to_str(interface_tok) ) );
 			// <ModuleFlags> <class/struct> <Attributes> <Name> : <Access Specifier> <Name>, ...
 		}
 	}
 
-	if ( check( TokType::BraceCurly_Open ) )
-	{
+	if ( check( Tok_BraceCurly_Open ) ) {
 		body = parse_class_struct_body( which, name );
 	}
 	// <ModuleFlags> <class/struct> <Attributes> <Name> : <Access Specifier> <Name>, ... { <Body> }
 
-	CodeComment inline_cmt = NoCode;
+	CodeComment inline_cmt = NullCode;
 	if ( ! inplace_def )
 	{
 		Token stmt_end = currtok;
-		eat( TokType::Statement_End );
+		eat( Tok_Statement_End );
 		// <ModuleFlags> <class/struct> <Attributes> <Name> : <Access Specifier> <Name>, ... { <Body> };
 
-		if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
+		if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
 			inline_cmt = parse_comment();
-			// <ModuleFlags> <class/struct> <Attributes> <Name> : <Access Specifier> <Name>, ... { <Body> }; <InlineCmt>
+		// <ModuleFlags> <class/struct> <Attributes> <Name> : <Access Specifier> <Name>, ... { <Body> }; <InlineCmt>
 	}
 
-	if ( which == TokType::Decl_Class )
-		result = def_class( name, body, parent, access, attributes, mflags );
+	if ( which == Tok_Decl_Class )
+		result = cast(Code, def_class( tok_to_str(name), def_assign( body, parent, access, attributes, interfaces, scast(s32, array_num(interfaces)), mflags ) ));
 
 	else
-		result = def_struct( name, body, (CodeType)parent, access, attributes, mflags );
+		result = cast(Code, def_struct( tok_to_str(name), def_assign( body, (CodeTypename)parent, access, attributes, interfaces, scast(s32, array_num(interfaces)), mflags ) ));
 
 	if ( inline_cmt )
-		result->InlineCmt = inline_cmt;
+		result->InlineCmt = cast(Code, inline_cmt);
 
-	interfaces.free();
+	array_free(interfaces);
 	return result;
 }
 
 internal neverinline
 CodeBody parse_class_struct_body( TokType which, Token name )
 {
-	using namespace ECode;
 	push_scope();
 
-	eat( TokType::BraceCurly_Open );
+	eat( Tok_BraceCurly_Open );
 	// {
 
 	CodeBody
 	result = (CodeBody) make_code();
 
-	if ( which == TokType::Decl_Class )
-		result->Type = Class_Body;
+	if ( which == Tok_Decl_Class )
+		result->Type = CT_Class_Body;
 
 	else
-		result->Type = Struct_Body;
+		result->Type = CT_Struct_Body;
 
-	while ( left && currtok_noskip.Type != TokType::BraceCurly_Close )
+	while ( left && currtok_noskip.Type != Tok_BraceCurly_Close )
 	{
-		Code           member     = Code::Invalid;
+		Code           member     = Code_Invalid;
 		CodeAttributes attributes = { nullptr };
 		CodeSpecifiers specifiers = { nullptr };
 
 		bool expects_function = false;
 
-		// Context.Scope->Start = currtok_noskip;
+		// _ctx->parser.Scope->Start = currtok_noskip;
 
-		if ( currtok_noskip.Type == TokType::Preprocess_Hash )
-			eat( TokType::Preprocess_Hash );
+		if ( currtok_noskip.Type == Tok_Preprocess_Hash )
+			eat( Tok_Preprocess_Hash );
 
 		switch ( currtok_noskip.Type )
 		{
-			case TokType::Statement_End:
-			{
+			case Tok_Statement_End: {
 				// TODO(Ed): Convert this to a general warning procedure
-				log_fmt("Dangling end statement found %S\n", currtok_noskip.to_string());
-				eat( TokType::Statement_End );
+				log_fmt("Dangling end statement found %SB\n", tok_to_strbuilder(currtok_noskip));
+				eat( Tok_Statement_End );
 				continue;
 			}
-			case TokType::NewLine:
+			case Tok_NewLine: {
 				member = fmt_newline;
-				eat( TokType::NewLine );
-			break;
-
-			case TokType::Comment:
-				member = parse_comment();
-			break;
-
-			case TokType::Access_Public:
+				eat( Tok_NewLine );
+				break;
+			}
+			case Tok_Comment: {
+				member = cast(Code, parse_comment());
+				break;
+			}
+			case Tok_Access_Public: {
 				member = access_public;
-				eat( TokType::Access_Public );
-				eat( TokType::Assign_Classifer );
+				eat( Tok_Access_Public );
+				eat( Tok_Assign_Classifer );
 				// public:
-			break;
-
-			case TokType::Access_Protected:
+				break;
+			}
+			case Tok_Access_Protected: {
 				member = access_protected;
-				eat( TokType::Access_Protected );
-				eat( TokType::Assign_Classifer );
+				eat( Tok_Access_Protected );
+				eat( Tok_Assign_Classifer );
 				// protected:
-			break;
-
-			case TokType::Access_Private:
+				break;
+			}
+			case Tok_Access_Private: {
 				member = access_private;
-				eat( TokType::Access_Private );
-				eat( TokType::Assign_Classifer );
+				eat( Tok_Access_Private );
+				eat( Tok_Assign_Classifer );
 				// private:
-			break;
-
-			case TokType::Decl_Class:
-				member = parse_complicated_definition( TokType::Decl_Class );
+				break;
+			}
+			case Tok_Decl_Class: {
+				member = parse_complicated_definition( Tok_Decl_Class );
 				// class
-			break;
-
-			case TokType::Decl_Enum:
-				member = parse_complicated_definition( TokType::Decl_Enum );
+				break;
+			}
+			case Tok_Decl_Enum: {
+				member = parse_complicated_definition( Tok_Decl_Enum );
 				// enum
-			break;
-
-			case TokType::Decl_Friend:
-				member = parse_friend();
+				break;
+			}
+			case Tok_Decl_Friend: {
+				member = cast(Code, parser_parse_friend());
 				// friend
-			break;
-
-			case TokType::Decl_Operator:
-				member = parse_operator_cast();
+				break;
+			}
+			case Tok_Decl_Operator: {
+				member = cast(Code, parser_parse_operator_cast(NullCode));
 				// operator <Type>()
-			break;
-
-			case TokType::Decl_Struct:
-				member = parse_complicated_definition( TokType::Decl_Struct );
+				break;
+			}
+			case Tok_Decl_Struct: {
+				member = parse_complicated_definition( Tok_Decl_Struct );
 				// struct
-			break;
-
-			case TokType::Decl_Template:
-				member = parse_template();
+				break;
+			}
+			case Tok_Decl_Template: {
+				member = cast(Code, parser_parse_template());
 				// template< ... >
-			break;
-
-			case TokType::Decl_Typedef:
-				member = parse_typedef();
+				break;
+			}
+			case Tok_Decl_Typedef: {
+				member = cast(Code, parser_parse_typedef());
 				// typedef
-			break;
-
-			case TokType::Decl_Union:
-				member = parse_complicated_definition( TokType::Decl_Union );
+				break;
+			}
+			case Tok_Decl_Union: {
+				member = parse_complicated_definition( Tok_Decl_Union );
 				// union
-			break;
-
-			case TokType::Decl_Using:
-				member = parse_using();
+				break;
+			}
+			case Tok_Decl_Using: {
+				member = cast(Code, parser_parse_using());
 				// using
-			break;
+				break;
+			}
+			case Tok_Operator:
+			{
+				//if ( currtok.Text[0] != '~' )
+				//{
+				//	log_failure( "Operator token found in global body but not destructor unary negation\n%s", to_strbuilder(_ctx->parser) );
+				//	return InvalidCode;
+				//}
 
-			case TokType::Operator:
-				if ( currtok.Text[0] != '~' )
-				{
-					log_failure( "Operator token found in global body but not destructor unary negation\n%s", Context.to_string() );
-					return CodeInvalid;
-				}
-
-				member = parse_destructor();
+				member = cast(Code, parser_parse_destructor(NullCode));
 				// ~<Name>()
-			break;
-
-			case TokType::Preprocess_Define:
-				member = parse_define();
+				break;
+			}
+			case Tok_Preprocess_Define: {
+				member = cast(Code, parser_parse_define());
 				// #define
-			break;
-
-			case TokType::Preprocess_Include:
-				member = parse_include();
+				break;
+			}
+			case Tok_Preprocess_Include:
+			{
+				member = cast(Code, parse_include());
 				// #include
-			break;
+				break;
+			}
 
-			case TokType::Preprocess_If:
-			case TokType::Preprocess_IfDef:
-			case TokType::Preprocess_IfNotDef:
-			case TokType::Preprocess_ElIf:
-				member = parse_preprocess_cond();
+			case Tok_Preprocess_If:
+			case Tok_Preprocess_IfDef:
+			case Tok_Preprocess_IfNotDef:
+			case Tok_Preprocess_ElIf:
+				member = cast(Code, parse_preprocess_cond());
 				// #<Condition>
 			break;
 
-			case TokType::Preprocess_Else:
-				member = preprocess_else;
-				eat( TokType::Preprocess_Else );
+			case Tok_Preprocess_Else: {
+				member = cast(Code, preprocess_else);
+				eat( Tok_Preprocess_Else );
 				// #else
-			break;
-
-			case TokType::Preprocess_EndIf:
-				member = preprocess_endif;
-				eat( TokType::Preprocess_EndIf );
+				break;
+			}
+			case Tok_Preprocess_EndIf: {
+				member = cast(Code, preprocess_endif);
+				eat( Tok_Preprocess_EndIf );
 				// #endif
-			break;
+				break;
+			}
 
-			case TokType::Preprocess_Macro:
-				member = parse_simple_preprocess( TokType::Preprocess_Macro );
-				// <Macro>
-			break;
+			case Tok_Preprocess_Macro_Stmt: {
+				member = cast(Code, parse_simple_preprocess( Tok_Preprocess_Macro_Stmt ));
+				break;
+			}
+			case Tok_Preprocess_Macro_Expr: {
+				log_failure("Unbounded macro expression residing in class/struct body\n%S", parser_to_strbuilder(_ctx->parser));
+				return InvalidCode;
+			}
 
-			case TokType::Preprocess_Pragma:
-				member = parse_pragma();
+			// case Tok_Preprocess_Macro:
+			// 	// <Macro>
+			// 	macro_found = true;
+			// 	goto Preprocess_Macro_Bare_In_Body;
+			// break;
+
+			case Tok_Preprocess_Pragma: {
+				member = cast(Code, parse_pragma());
 				// #pragma
-			break;
+				break;
+			}
 
-			case TokType::Preprocess_Unsupported:
-				member = parse_simple_preprocess( TokType::Preprocess_Unsupported );
+			case Tok_Preprocess_Unsupported: {
+				member = cast(Code, parse_simple_preprocess( Tok_Preprocess_Unsupported ));
 				// #<UNKNOWN>
-			break;
+				break;
+			}
 
-			case TokType::StaticAssert:
+			case Tok_StaticAssert: {
 				member = parse_static_assert();
 				// static_assert
-			break;
+				break;
+			}
 
-			case TokType::Attribute_Open:
-			case TokType::Decl_GNU_Attribute:
-			case TokType::Decl_MSVC_Attribute:
-		#define Entry( attribute, str ) case TokType::attribute:
+			case Tok_Attribute_Open:
+			case Tok_Decl_GNU_Attribute:
+			case Tok_Decl_MSVC_Attribute:
+		#define Entry( attribute, str ) case attribute:
 			GEN_DEFINE_ATTRIBUTE_TOKENS
 		#undef Entry
 			{
@@ -8125,53 +8017,34 @@ CodeBody parse_class_struct_body( TokType which, Token name )
 				// <Attributes>
 			}
 			//! Fallthrough intended
-			case TokType::Spec_Consteval:
-			case TokType::Spec_Constexpr:
-			case TokType::Spec_Constinit:
-			case TokType::Spec_Explicit:
-			case TokType::Spec_ForceInline:
-			case TokType::Spec_Inline:
-			case TokType::Spec_Mutable:
-			case TokType::Spec_NeverInline:
-			case TokType::Spec_Static:
-			case TokType::Spec_Volatile:
-			case TokType::Spec_Virtual:
+			GEN_PARSER_CLASS_STRUCT_BODY_ALLOWED_MEMBER_TOK_SPECIFIERS_CASES:
 			{
-				SpecifierT specs_found[16] { ESpecifier::NumSpecifiers };
+				Specifier specs_found[16] = { Spec_NumSpecifiers };
 				s32        NumSpecifiers = 0;
 
-				while ( left && currtok.is_specifier() )
+				while ( left && tok_is_specifier(currtok) )
 				{
-					SpecifierT spec = ESpecifier::to_type( currtok );
+					Specifier spec = str_to_specifier( tok_to_str(currtok) );
 
 					b32 ignore_spec = false;
 
 					switch ( spec )
 					{
-						case ESpecifier::Constexpr:
-						case ESpecifier::Constinit:
-						case ESpecifier::Explicit:
-						case ESpecifier::Inline:
-						case ESpecifier::ForceInline:
-						case ESpecifier::Mutable:
-						case ESpecifier::NeverInline:
-						case ESpecifier::Static:
-						case ESpecifier::Volatile:
-						case ESpecifier::Virtual:
+						GEN_PARSER_CLASS_STRUCT_BODY_ALLOWED_MEMBER_SPECIFIERS_CASES:
 						break;
 
-						case ESpecifier::Consteval:
+						case Spec_Consteval:
 							expects_function = true;
 						break;
 
-						case ESpecifier::Const :
+						case Spec_Const :
 							ignore_spec = true;
 						break;
 
 						default:
-							log_failure( "Invalid specifier %s for variable\n%s", ESpecifier::to_str(spec), Context.to_string() );
-							Context.pop();
-							return CodeInvalid;
+							log_failure( "Invalid specifier %S for class/struct member\n%S", spec_to_str(spec), strbuilder_to_str( parser_to_strbuilder(_ctx->parser)) );
+							parser_pop(& _ctx->parser);
+							return InvalidCode;
 					}
 
 					// Every specifier after would be considered part of the type type signature
@@ -8189,17 +8062,18 @@ CodeBody parse_class_struct_body( TokType which, Token name )
 				}
 				// <Attributes> <Specifiers>
 
-				if ( currtok.is_attribute() )
+				if ( tok_is_attribute(currtok) )
 				{
 					// Unfortuantely Unreal has code where there is attirbutes before specifiers
 					CodeAttributes more_attributes = parse_attributes();
 
 					if ( attributes )
 					{
-						String fused = String::make_reserve( GlobalAllocator, attributes->Content.length() + more_attributes->Content.length() );
-						fused.append_fmt( "%S %S", attributes->Content, more_attributes->Content );
+						StrBuilder fused = strbuilder_make_reserve( _ctx->Allocator_Temp, attributes->Content.Len + more_attributes->Content.Len );
+						strbuilder_append_fmt( & fused, "%SB %SB", attributes->Content, more_attributes->Content );
 
-						attributes->Name    = get_cached_string(fused);
+						Str attrib_name     = strbuilder_to_str(fused);
+						attributes->Name    = cache_str( attrib_name );
 						attributes->Content = attributes->Name;
 						// <Attributes> <Specifiers> <Attributes>
 					}
@@ -8207,37 +8081,38 @@ CodeBody parse_class_struct_body( TokType which, Token name )
 					attributes = more_attributes;
 				}
 
-				if ( currtok.Type == TokType::Operator && currtok.Text[0] == '~' )
+				if ( currtok.Type == Tok_Operator && currtok.Text.Ptr[0] == '~' )
 				{
-					member = parse_destructor( specifiers );
+					member = cast(Code, parser_parse_destructor( specifiers ));
 					// <Attribute> <Specifiers> ~<Name>()
 					break;
 				}
 
-				if ( currtok.Type == TokType::Decl_Operator )
+				if ( currtok.Type == Tok_Decl_Operator )
 				{
-					member = parse_operator_cast( specifiers );
+					member = cast(Code, parser_parse_operator_cast( specifiers ));
 					// <Attributes> <Specifiers> operator <Type>()
 					break;
 				}
 			}
 			//! Fallthrough intentional
-			case TokType::Identifier:
-			case TokType::Spec_Const:
-			case TokType::Type_Unsigned:
-			case TokType::Type_Signed:
-			case TokType::Type_Short:
-			case TokType::Type_Long:
-			case TokType::Type_bool:
-			case TokType::Type_char:
-			case TokType::Type_int:
-			case TokType::Type_double:
+			case Tok_Identifier:
+			case Tok_Preprocess_Macro_Typename:
+			case Tok_Spec_Const:
+			case Tok_Type_Unsigned:
+			case Tok_Type_Signed:
+			case Tok_Type_Short:
+			case Tok_Type_Long:
+			case Tok_Type_bool:
+			case Tok_Type_char:
+			case Tok_Type_int:
+			case Tok_Type_double:
 			{
-				if ( nexttok.Type == TokType::Capture_Start && name.Length && currtok.Type == TokType::Identifier )
+				if ( nexttok.Type == Tok_Capture_Start && name.Text.Len && currtok.Type == Tok_Identifier )
 				{
-					if ( str_compare( name.Text, currtok.Text, name.Length ) == 0 )
+					if ( c_str_compare_len( name.Text.Ptr, currtok.Text.Ptr, name.Text.Len ) == 0 )
 					{
-						member = parse_constructor( specifiers );
+						member = cast(Code, parser_parse_constructor( specifiers ));
 						// <Attributes> <Specifiers> <Name>()
 						break;
 					}
@@ -8252,49 +8127,44 @@ CodeBody parse_class_struct_body( TokType which, Token name )
 
 			default:
 				Token untyped_tok = currtok;
-
-				while ( left && currtok.Type != TokType::BraceCurly_Close )
+				while ( left && currtok.Type != Tok_BraceCurly_Close )
 				{
-					untyped_tok.Length = ( (sptr)currtok.Text + currtok.Length ) - (sptr)untyped_tok.Text;
+					untyped_tok.Text.Len = ( (sptr)currtok.Text.Ptr + currtok.Text.Len ) - (sptr)untyped_tok.Text.Ptr;
 					eat( currtok.Type );
 				}
-
-				member = untyped_str( untyped_tok );
+				member = untyped_str( tok_to_str(untyped_tok) );
 				// Something unknown
 			break;
 		}
 
-		if ( member == Code::Invalid )
+		if ( member == Code_Invalid )
 		{
-			log_failure( "Failed to parse member\n%s", Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "Failed to parse member\n%s", parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
-
-		result.append( member );
+		body_append(result, member );
 	}
 
-	eat( TokType::BraceCurly_Close );
+	eat( Tok_BraceCurly_Close );
 	// { <Members> }
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
 CodeComment parse_comment()
 {
-	StackNode scope { nullptr, currtok_noskip, NullToken, txt( __func__ ) };
-	Context.push( & scope );
+	push_scope();
 
 	CodeComment
 	result          = (CodeComment) make_code();
-	result->Type    = ECode::Comment;
-	result->Content = get_cached_string( currtok_noskip );
-	result->Name    = result->Content;
+	result->Type    = CT_Comment;
+	result->Content = cache_str( tok_to_str(currtok_noskip) );
 	// result->Token   = currtok_noskip;
-	eat( TokType::Comment );
+	eat( Tok_Comment );
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
@@ -8305,19 +8175,19 @@ Code parse_complicated_definition( TokType which )
 
 	bool is_inplace = false;
 
-	TokArray tokens = Context.Tokens;
+	TokArray tokens = _ctx->parser.Tokens;
 
 	s32 idx         = tokens.Idx;
 	s32 level       = 0;
-	for ( ; idx < tokens.Arr.num(); idx++ )
+	for ( ; idx < array_num(tokens.Arr); idx++ )
 	{
-		if ( tokens[ idx ].Type == TokType::BraceCurly_Open )
+		if ( tokens.Arr[ idx ].Type == Tok_BraceCurly_Open )
 			level++;
 
-		if ( tokens[ idx ].Type == TokType::BraceCurly_Close )
+		if ( tokens.Arr[ idx ].Type == Tok_BraceCurly_Close )
 			level--;
 
-		if ( level == 0 && tokens[ idx ].Type == TokType::Statement_End )
+		if ( level == 0 && tokens.Arr[ idx ].Type == Tok_Statement_End )
 			break;
 	}
 
@@ -8326,68 +8196,68 @@ Code parse_complicated_definition( TokType which )
 		// Its a forward declaration only
 		Code result = parse_forward_or_definition( which, is_inplace );
 		// <class, enum, struct, or union> <Name>;
-		Context.pop();
+		parser_pop(& _ctx->parser);
 		return result;
 	}
 
-	Token tok = tokens[ idx - 1 ];
-	if ( tok.is_specifier() && is_trailing( ESpecifier::to_type(tok)) )
+	Token tok = tokens.Arr[ idx - 1 ];
+	if ( tok_is_specifier(tok) && spec_is_trailing( str_to_specifier( tok_to_str(tok))) )
 	{
 		// <which> <type_identifier>(...) <specifier> ...;
 
 		s32   spec_idx = idx - 1;
-		Token spec     = tokens[spec_idx];
-		while ( spec.is_specifier() && is_trailing( ESpecifier::to_type(spec)) )
+		Token spec     = tokens.Arr[spec_idx];
+		while ( tok_is_specifier(spec) && spec_is_trailing( str_to_specifier( tok_to_str(spec))) )
 		{
 			-- spec_idx;
-			spec = tokens[spec_idx];
+			spec = tokens.Arr[spec_idx];
 		}
 
-		if ( tokens[spec_idx].Type == TokType::Capture_End )
+		if ( tokens.Arr[spec_idx].Type == Tok_Capture_End )
 		{
 			// Forward declaration with trailing specifiers for a procedure
-			tok = tokens[spec_idx];
+			tok = tokens.Arr[spec_idx];
 
-			Code result = parse_operator_function_or_variable( false, { nullptr }, { nullptr } );
+			Code result = parse_operator_function_or_variable( false, NullCode, NullCode );
 			// <Attributes> <Specifiers> <ReturnType/ValueType> <operator <Op>, or Name> ...
-			Context.pop();
+			parser_pop(& _ctx->parser);
 			return result;
 		}
 
-		log_failure( "Unsupported or bad member definition after %s declaration\n%s", to_str(which), Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
+		log_failure( "Unsupported or bad member definition after %s declaration\n%s", toktype_to_str(which), parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
-	if ( tok.Type == TokType::Identifier )
+	if ( tok.Type == Tok_Identifier )
 	{
-		tok = tokens[ idx - 2 ];
-		bool is_indirection = tok.Type == TokType::Ampersand || tok.Type == TokType::Star;
+		tok = tokens.Arr[ idx - 2 ];
+		bool is_indirection = tok.Type == Tok_Ampersand || tok.Type == Tok_Star;
 		bool ok_to_parse    = false;
 
-		if ( tok.Type == TokType::BraceCurly_Close )
+		if ( tok.Type == Tok_BraceCurly_Close )
 		{
 			// Its an inplace definition
 			// <which> <type_identifier> { ... } <identifier>;
 			ok_to_parse = true;
 			is_inplace  = true;
 		}
-		else if ( tok.Type == TokType::Identifier && tokens[ idx - 3 ].Type == which )
+		else if ( tok.Type == Tok_Identifier && tokens.Arr[ idx - 3 ].Type == which )
 		{
 			// Its a variable with type ID using <which> namespace.
 			// <which> <type_identifier> <identifier>;
 			ok_to_parse = true;
 		}
-		else if ( tok.Type == TokType::Assign_Classifer
-		&& (	( tokens[idx - 5].Type == which && tokens[idx - 4].Type == TokType::Decl_Class )
-			||	( tokens[idx - 4].Type == which))
+		else if ( tok.Type == Tok_Assign_Classifer
+		&& (	( tokens.Arr[idx - 5].Type == which && tokens.Arr[idx - 4].Type == Tok_Decl_Class )
+			||	( tokens.Arr[idx - 4].Type == which))
 		)
 		{
 			// Its a forward declaration of an enum
 			// <enum>         <type_identifier> : <identifier>;
 			// <enum> <class> <type_identifier> : <identifier>;
 			ok_to_parse = true;
-			Code result = parse_enum();
-			Context.pop();
+			Code result = cast(Code, parser_parse_enum( ! parser_inplace_def));
+			parser_pop(& _ctx->parser);
 			return result;
 		}
 		else if ( is_indirection )
@@ -8399,143 +8269,95 @@ Code parse_complicated_definition( TokType which )
 
 		if ( ! ok_to_parse )
 		{
-			log_failure( "Unsupported or bad member definition after %s declaration\n%s", to_str(which), Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "Unsupported or bad member definition after %s declaration\n%s", toktype_to_str(which), parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 
-		Code result = parse_operator_function_or_variable( false, { nullptr }, { nullptr } );
+		Code result = parse_operator_function_or_variable( false, NullCode, NullCode );
 		// <Attributes> <Specifiers> <ReturnType/ValueType> <operator <Op>, or Name> ...
-		Context.pop();
+		parser_pop(& _ctx->parser);
 		return result;
 	}
-	else if ( tok.Type >= TokType::Type_Unsigned && tok.Type <= TokType::Type_MS_W64 )
+	else if ( tok.Type >= Tok_Type_Unsigned && tok.Type <= Tok_Type_MS_W64 )
 	{
-		tok = tokens[ idx - 2 ];
+		tok = tokens.Arr[ idx - 2 ];
 
-		if ( tok.Type != TokType::Assign_Classifer
-		|| (	( tokens[idx - 5].Type != which && tokens[idx - 4].Type != TokType::Decl_Class )
-			&&	( tokens[idx - 4].Type != which))
+		if ( tok.Type != Tok_Assign_Classifer
+		|| (	( tokens.Arr[idx - 5].Type != which && tokens.Arr[idx - 4].Type != Tok_Decl_Class )
+			&&	( tokens.Arr[idx - 4].Type != which))
 		)
 		{
-			log_failure( "Unsupported or bad member definition after %s declaration\n%s", to_str(which), Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "Unsupported or bad member definition after %s declaration\n%s", toktype_to_str(which), parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 
 		// Its a forward declaration of an enum class
 		// <enum>         <type_identifier> : <identifier>;
 		// <enum> <class> <type_identifier> : <identifier>;
-		Code result = parse_enum();
-		Context.pop();
+		Code result = cast(Code, parser_parse_enum( ! parser_inplace_def));
+		parser_pop(& _ctx->parser);
 		return result;
 	}
-	else if ( tok.Type == TokType::BraceCurly_Close )
+	else if ( tok.Type == Tok_BraceCurly_Close )
 	{
 		// Its a definition
 		Code result = parse_forward_or_definition( which, is_inplace );
 		// <which> { ... };
-		Context.pop();
+		parser_pop(& _ctx->parser);
 		return result;
 	}
-	else if ( tok.Type == TokType::BraceSquare_Close )
+	else if ( tok.Type == Tok_BraceSquare_Close )
 	{
 		// Its an array definition
-		Code result = parse_operator_function_or_variable( false, { nullptr }, { nullptr } );
+		Code result = parse_operator_function_or_variable( false, NullCode, NullCode );
 		// <which> <type_identifier> <identifier> [ ... ];
-		Context.pop();
+		parser_pop(& _ctx->parser);
 		return result;
 	}
 	else
 	{
-		log_failure( "Unsupported or bad member definition after %s declaration\n%S", to_str(which).Ptr, Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
+		log_failure( "Unsupported or bad member definition after %s declaration\n%SB", toktype_to_str(which).Ptr, parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 }
 
-internal inline
-CodeDefine parse_define()
-{
-	push_scope();
-	eat( TokType::Preprocess_Define );
-	// #define
-
-	CodeDefine
-	define = (CodeDefine) make_code();
-	define->Type = ECode::Preprocess_Define;
-
-	if ( ! check( TokType::Identifier ) )
-	{
-		log_failure( "Error, expected identifier after #define\n%s", Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
-	}
-
-	Context.Scope->Name = currtok;
-	define->Name = get_cached_string( currtok );
-	eat( TokType::Identifier );
-	// #define <Name>
-
-	if ( ! check( TokType::Preprocess_Content ))
-	{
-		log_failure( "Error, expected content after #define %s\n%s", define->Name, Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
-	}
-
-	if ( currtok.Length == 0 )
-	{
-		define->Content = get_cached_string( currtok );
-		eat( TokType::Preprocess_Content );
-		// #define <Name> <Content>
-
-		Context.pop();
-		return define;
-	}
-
-	define->Content = get_cached_string( strip_formatting( currtok, strip_formatting_dont_preserve_newlines ) );
-	eat( TokType::Preprocess_Content );
-	// #define <Name> <Content>
-
-	Context.pop();
-	return define;
-}
-
 internal inline
 Code parse_assignment_expression()
 {
 	Code expr = { nullptr };
 
-	eat( TokType::Operator );
+	eat( Tok_Operator );
 	// <Attributes> <Specifiers> <ValueType> <Name> =
 
 	Token expr_tok = currtok;
 
-	if ( currtok.Type == TokType::Statement_End && currtok.Type != TokType::Comma )
+	if ( currtok.Type == Tok_Statement_End && currtok.Type != Tok_Comma )
 	{
-		log_failure( "Expected expression after assignment operator\n%s", Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
+		log_failure( "Expected expression after assignment operator\n%s", parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 
 	s32 level = 0;
-	while ( left && currtok.Type != TokType::Statement_End && (currtok.Type != TokType::Comma || level > 0) )
+	while ( left && currtok.Type != Tok_Statement_End && (currtok.Type != Tok_Comma || level > 0) )
 	{
-		if (currtok.Type == TokType::BraceCurly_Open )
+		if (currtok.Type == Tok_BraceCurly_Open )
 			level++;
-		if (currtok.Type == TokType::BraceCurly_Close )
+		if (currtok.Type == Tok_BraceCurly_Close )
 			level--;
-		if (currtok.Type == TokType::Capture_Start)
+		if (currtok.Type == Tok_Capture_Start)
 			level++;
-		else if (currtok.Type == TokType::Capture_End)
+		else if (currtok.Type == Tok_Capture_End)
 			level--;
 
 		eat( currtok.Type );
 	}
 
-	expr_tok.Length = ( ( sptr )currtok.Text + currtok.Length ) - ( sptr )expr_tok.Text - 1;
-	expr            = untyped_str( expr_tok );
+	expr_tok.Text.Len = ( ( sptr )currtok.Text.Ptr + currtok.Text.Len ) - ( sptr )expr_tok.Text.Ptr - 1;
+	expr              = untyped_str( tok_to_str(expr_tok) );
 	// = <Expression>
 	return expr;
 }
@@ -8543,32 +8365,32 @@ Code parse_assignment_expression()
 internal inline
 Code parse_forward_or_definition( TokType which, bool is_inplace )
 {
-	Code result = CodeInvalid;
+	Code result = InvalidCode;
 
 	switch ( which )
 	{
-		case TokType::Decl_Class:
-			result = parse_class( is_inplace );
+		case Tok_Decl_Class:
+			result = cast(Code, parser_parse_class( is_inplace ));
 			return result;
 
-		case TokType::Decl_Enum:
-			result = parse_enum( is_inplace );
+		case Tok_Decl_Enum:
+			result = cast(Code, parser_parse_enum( is_inplace ));
 			return result;
 
-		case TokType::Decl_Struct:
-			result = parse_struct( is_inplace );
+		case Tok_Decl_Struct:
+			result = cast(Code, parser_parse_struct( is_inplace ));
 			return result;
 
-		case TokType::Decl_Union:
-			result = parse_union( is_inplace );
+		case Tok_Decl_Union:
+			result = cast(Code, parser_parse_union( is_inplace ));
 			return result;
 
 		default:
 			log_failure( "Error, wrong token type given to parse_complicated_definition "
 				"(only supports class, enum, struct, union) \n%s"
-				, Context.to_string() );
+				, parser_to_strbuilder(_ctx->parser) );
 
-			return CodeInvalid;
+			return InvalidCode;
 	}
 }
 
@@ -8578,99 +8400,97 @@ CodeFn parse_function_after_name(
 	  ModuleFlag     mflags
 	, CodeAttributes attributes
 	, CodeSpecifiers specifiers
-	, CodeType       ret_type
+	, CodeTypename   ret_type
 	, Token          name
 )
 {
 	push_scope();
-	CodeParam params = parse_params();
+	CodeParams params = parse_params(parser_use_parenthesis);
 	// <Attributes> <Specifiers> <ReturnType> <Name> ( <Parameters> )
 
-	// TODO(Ed), Review old comment : These have to be kept separate from the return type's specifiers. 
-	while ( left && currtok.is_specifier() )
+	// TODO(Ed), Review old comment : These have to be kept separate from the return type's specifiers.
+	while ( left && tok_is_specifier(currtok) )
 	{
-		if ( specifiers.ast == nullptr )
+		if ( specifiers == nullptr )
 		{
-			specifiers = def_specifier( ESpecifier::to_type(currtok) );
+			specifiers = def_specifier( str_to_specifier( tok_to_str(currtok)) );
 			eat( currtok.Type );
 			continue;
 		}
 
-		specifiers.append( ESpecifier::to_type(currtok) );
+		specifiers_append(specifiers, str_to_specifier( tok_to_str(currtok)) );
 		eat( currtok.Type );
 	}
 	// <Attributes> <Specifiers> <ReturnType> <Name> ( <Paraemters> ) <Specifiers>
 
-	CodeBody    body       = NoCode;
-	CodeComment inline_cmt = NoCode;
-	if ( check( TokType::BraceCurly_Open ) )
+	CodeBody    body       = NullCode;
+	CodeComment inline_cmt = NullCode;
+	if ( check( Tok_BraceCurly_Open ) )
 	{
-		body = parse_function_body();
-		if ( body == Code::Invalid )
+		body = cast(CodeBody, parse_function_body());
+		if ( cast(Code, body) == Code_Invalid )
 		{
-			Context.pop();
-			return CodeInvalid;
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 		// <Attributes> <Specifiers> <ReturnType> <Name> ( <Paraemters> ) <Specifiers> { <Body> }
 	}
-	else if ( check(TokType::Operator) && currtok.Text[0] == '=' )
+	else if ( check(Tok_Operator) && currtok.Text.Ptr[0] == '=' )
 	{
-		eat(TokType::Operator);
-		specifiers.append( ESpecifier::Pure );
+		eat(Tok_Operator);
+		specifiers_append(specifiers, Spec_Pure );
 
-		eat( TokType::Number);
+		eat( Tok_Number);
 		Token stmt_end = currtok;
-		eat( TokType::Statement_End );
+		eat( Tok_Statement_End );
 		// <Attributes> <Specifiers> <ReturnType> <Name> ( <Paraemters> ) <Specifiers> = 0;
 
-		if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
+		if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
 			inline_cmt = parse_comment();
 		// <Attributes> <Specifiers> <ReturnType> <Name> ( <Paraemters> ) <Specifiers>; <InlineCmt>
 	}
 	else
 	{
 		Token stmt_end = currtok;
-		eat( TokType::Statement_End );
+		eat( Tok_Statement_End );
 		// <Attributes> <Specifiers> <ReturnType> <Name> ( <Paraemters> ) <Specifiers>;
 
-		if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
+		if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
 			inline_cmt = parse_comment();
 			// <Attributes> <Specifiers> <ReturnType> <Name> ( <Paraemters> ) <Specifiers>; <InlineCmt>
 	}
 
-	using namespace ECode;
-
-	String
-	name_stripped = String::make( GlobalAllocator, name );
-	name_stripped.strip_space();
+	StrBuilder
+	name_stripped = strbuilder_make_str( _ctx->Allocator_Temp, tok_to_str(name) );
+	strbuilder_strip_space(name_stripped);
 
 	CodeFn
 	result              = (CodeFn) make_code();
-	result->Name        = get_cached_string( name_stripped );
+	result->Name        = cache_str( strbuilder_to_str(name_stripped) );
 	result->ModuleFlags = mflags;
 
 	if ( body )
 	{
 		switch ( body->Type )
 		{
-			case Function_Body:
-			case Untyped:
+			case CT_Function_Body:
+			case CT_Untyped:
 				break;
 
 			default:
 			{
-				log_failure("Body must be either of Function_Body or Untyped type, %s\n%s", body.debug_str(), Context.to_string());
-				Context.pop();
-				return CodeInvalid;
+				log_failure("Body must be either of Function_Body or Untyped type, %s\n%s", code_debug_str(body), parser_to_strbuilder(_ctx->parser));
+				parser_pop(& _ctx->parser);
+				return InvalidCode;
 			}
 		}
 
-		result->Type = Function;
+		result->Type = CT_Function;
 		result->Body = body;
 	}
 	else
 	{
-		result->Type = Function_Fwd;
+		result->Type = CT_Function_Fwd;
 	}
 
 	if ( attributes )
@@ -8687,218 +8507,233 @@ CodeFn parse_function_after_name(
 	if ( inline_cmt )
 		result->InlineCmt = inline_cmt;
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
 Code parse_function_body()
 {
-	using namespace ECode;
 	push_scope();
 
-	eat( TokType::BraceCurly_Open );
+	eat( Tok_BraceCurly_Open );
 
 	CodeBody
 	result = (CodeBody) make_code();
-	result->Type = Function_Body;
+	result->Type = CT_Function_Body;
 
 	// TODO : Support actual parsing of function body
 	Token start = currtok_noskip;
 
 	s32 level = 0;
-	while ( left && ( currtok_noskip.Type != TokType::BraceCurly_Close || level > 0 ) )
+	while ( left && ( currtok_noskip.Type != Tok_BraceCurly_Close || level > 0 ) )
 	{
-		if ( currtok_noskip.Type == TokType::BraceCurly_Open )
+		if ( currtok_noskip.Type == Tok_BraceCurly_Open )
 			level++;
 
-		else if ( currtok_noskip.Type == TokType::BraceCurly_Close && level > 0 )
+		else if ( currtok_noskip.Type == Tok_BraceCurly_Close && level > 0 )
 			level--;
 
 		eat( currtok_noskip.Type );
 	}
 
-	Token previous = prevtok;
+	Token past = prevtok;
 
-	s32 len = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)start.Text;
+	s32 len = ( (sptr)prevtok.Text.Ptr + prevtok.Text.Len ) - (sptr)start.Text.Ptr;
 
 	if ( len > 0 )
 	{
-		result.append( def_execution( { len, start.Text } ) );
+		Str str = { start.Text.Ptr, len };
+		body_append( result, cast(Code, def_execution( str )) );
 	}
 
-	eat( TokType::BraceCurly_Close );
+	eat( Tok_BraceCurly_Close );
 
-	Context.pop();
-	return result;
+	parser_pop(& _ctx->parser);
+	return cast(Code, result);
 }
 
 internal neverinline
-CodeBody parse_global_nspace( CodeT which )
+CodeBody parse_global_nspace( CodeType which )
 {
-	using namespace ECode;
-
 	push_scope();
 
-	if ( which != Namespace_Body && which != Global_Body && which != Export_Body && which != Extern_Linkage_Body )
-		return CodeInvalid;
+	if ( which != CT_Namespace_Body && which != CT_Global_Body && which != CT_Export_Body && which != CT_Extern_Linkage_Body )
+		return InvalidCode;
 
-	if ( which != Global_Body )
-		eat( TokType::BraceCurly_Open );
+	if ( which != CT_Global_Body )
+		eat( Tok_BraceCurly_Open );
 		// {
 
 	CodeBody
 	result = (CodeBody) make_code();
 	result->Type = which;
 
-	while ( left && currtok_noskip.Type != TokType::BraceCurly_Close )
+	while ( left && currtok_noskip.Type != Tok_BraceCurly_Close )
 	{
-		Code           member     = Code::Invalid;
+		Code           member     = Code_Invalid;
 		CodeAttributes attributes = { nullptr };
 		CodeSpecifiers specifiers = { nullptr };
 
 		bool expects_function = false;
 
-		// Context.Scope->Start = currtok_noskip;
+		// _ctx->parser.Scope->Start = currtok_noskip;
 
-		if ( currtok_noskip.Type == TokType::Preprocess_Hash )
-			eat( TokType::Preprocess_Hash );
+		if ( currtok_noskip.Type == Tok_Preprocess_Hash )
+			eat( Tok_Preprocess_Hash );
+
+		b32 macro_found = false;
 
 		switch ( currtok_noskip.Type )
 		{
-			case TokType::Statement_End:
+			case Tok_Comma:
+			{
+				log_failure("Dangling comma found: %SB\nContext:\n%SB", tok_to_strbuilder(currtok), parser_to_strbuilder(_ctx->parser));
+				parser_pop( & _ctx->parser);
+				return InvalidCode;
+			}
+			break;
+			case Tok_Statement_End:
 			{
 				// TODO(Ed): Convert this to a general warning procedure
-				log_fmt("Dangling end statement found %S\n", currtok_noskip.to_string());
-				eat( TokType::Statement_End );
+				log_fmt("Dangling end statement found %SB\n", tok_to_strbuilder(currtok_noskip));
+				eat( Tok_Statement_End );
 				continue;
 			}
-			case TokType::NewLine:
+			case Tok_NewLine:
 				// Empty lines are auto skipped by Tokens.current()
 				member = fmt_newline;
-				eat( TokType::NewLine );
+				eat( Tok_NewLine );
 			break;
 
-			case TokType::Comment:
-				member = parse_comment();
+			case Tok_Comment:
+				member = cast(Code, parse_comment());
 			break;
 
-			case TokType::Decl_Class:
-				member = parse_complicated_definition( TokType::Decl_Class );
+			case Tok_Decl_Class:
+				member = parse_complicated_definition( Tok_Decl_Class );
 				// class
 			break;
 
-			case TokType::Decl_Enum:
-				member = parse_complicated_definition( TokType::Decl_Enum );
+			case Tok_Decl_Enum:
+				member = parse_complicated_definition( Tok_Decl_Enum );
 				// enum
 			break;
 
-			case TokType::Decl_Extern_Linkage:
-				if ( which == Extern_Linkage_Body )
-					log_failure( "Nested extern linkage\n%s", Context.to_string() );
+			case Tok_Decl_Extern_Linkage:
+				if ( which == CT_Extern_Linkage_Body )
+					log_failure( "Nested extern linkage\n%s", parser_to_strbuilder(_ctx->parser) );
 
-				member = parse_extern_link();
+				member = cast(Code, parser_parse_extern_link());
 				// extern "..." { ... }
 			break;
 
-			case TokType::Decl_Namespace:
-				member = parse_namespace();
+			case Tok_Decl_Namespace:
+				member = cast(Code, parser_parse_namespace());
 				// namespace <Name> { ... }
 			break;
 
-			case TokType::Decl_Struct:
-				member = parse_complicated_definition( TokType::Decl_Struct );
+			case Tok_Decl_Struct:
+				member = parse_complicated_definition( Tok_Decl_Struct );
 				// struct ...
 			break;
 
-			case TokType::Decl_Template:
-				member = parse_template();
+			case Tok_Decl_Template:
+				member = cast(Code, parser_parse_template());
 				// template<...> ...
 			break;
 
-			case TokType::Decl_Typedef:
-				member = parse_typedef();
+			case Tok_Decl_Typedef:
+				member = cast(Code, parser_parse_typedef());
 				// typedef ...
 			break;
 
-			case TokType::Decl_Union:
-				member = parse_complicated_definition( TokType::Decl_Union );
+			case Tok_Decl_Union:
+				member = parse_complicated_definition( Tok_Decl_Union );
 				// union ...
 			break;
 
-			case TokType::Decl_Using:
-				member = parse_using();
+			case Tok_Decl_Using:
+				member = cast(Code, parser_parse_using());
 				// using ...
 			break;
 
-			case TokType::Preprocess_Define:
-				member = parse_define();
+			case Tok_Preprocess_Define:
+				member = cast(Code, parser_parse_define());
 				// #define ...
 			break;
 
-			case TokType::Preprocess_Include:
-				member = parse_include();
+			case Tok_Preprocess_Include:
+				member = cast(Code, parse_include());
 				// #include ...
 			break;
 
-			case TokType::Preprocess_If:
-			case TokType::Preprocess_IfDef:
-			case TokType::Preprocess_IfNotDef:
-			case TokType::Preprocess_ElIf:
-				member = parse_preprocess_cond();
+			case Tok_Preprocess_If:
+			case Tok_Preprocess_IfDef:
+			case Tok_Preprocess_IfNotDef:
+			case Tok_Preprocess_ElIf:
+				member = cast(Code, parse_preprocess_cond());
 				// #<Conditional> ...
 			break;
 
-			case TokType::Preprocess_Else:
-				member = preprocess_else;
-				eat( TokType::Preprocess_Else );
+			case Tok_Preprocess_Else:
+				member = cast(Code, preprocess_else);
+				eat( Tok_Preprocess_Else );
 				// #else
 			break;
 
-			case TokType::Preprocess_EndIf:
-				member = preprocess_endif;
-				eat( TokType::Preprocess_EndIf );
+			case Tok_Preprocess_EndIf:
+				member = cast(Code, preprocess_endif);
+				eat( Tok_Preprocess_EndIf );
 				// #endif
 			break;
 
-			case TokType::Preprocess_Macro:
-				member = parse_simple_preprocess( TokType::Preprocess_Macro );
-				// <Macro>
-			break;
+			case Tok_Preprocess_Macro_Stmt: {
+				member = cast(Code, parse_simple_preprocess( Tok_Preprocess_Macro_Stmt ));
+				break;
+			}
+			case Tok_Preprocess_Macro_Expr: {
+				log_failure("Unbounded macro expression residing in class/struct body\n%S", parser_to_strbuilder(_ctx->parser));
+				return InvalidCode;
+			}
 
-			case TokType::Preprocess_Pragma:
-				member = parse_pragma();
+			case Tok_Preprocess_Pragma: {
+				member = cast(Code, parse_pragma());
 				// #pragma ...
+			}
 			break;
 
-			case TokType::Preprocess_Unsupported:
-				member = parse_simple_preprocess( TokType::Preprocess_Unsupported );
+			case Tok_Preprocess_Unsupported: {
+				member = cast(Code, parse_simple_preprocess( Tok_Preprocess_Unsupported ));
 				// #<UNSUPPORTED> ...
+			}
 			break;
 
-			case TokType::StaticAssert:
-				member = parse_static_assert();
+			case Tok_StaticAssert: {
+				member = cast(Code, parse_static_assert());
 				// static_assert( <Conditional Expression>, ... );
+			}
 			break;
 
-			case TokType::Module_Export:
-				if ( which == Export_Body )
-					log_failure( "Nested export declaration\n%s", Context.to_string() );
+			case Tok_Module_Export: {
+				if ( which == CT_Export_Body )
+					log_failure( "Nested export declaration\n%s", parser_to_strbuilder(_ctx->parser) );
 
-				member = parse_export_body();
+				member = cast(Code, parser_parse_export_body());
 				// export { ... }
+			}
 			break;
 
-			case TokType::Module_Import:
-			{
-				not_implemented( context );
+			case Tok_Module_Import: {
 				// import ...
+				log_failure( "gen::%s: This function is not implemented" );
+				return InvalidCode;
 			}
 			//! Fallthrough intentional
-			case TokType::Attribute_Open:
-			case TokType::Decl_GNU_Attribute:
-			case TokType::Decl_MSVC_Attribute:
-		#define Entry( attribute, str ) case TokType::attribute:
+			case Tok_Attribute_Open:
+			case Tok_Decl_GNU_Attribute:
+			case Tok_Decl_MSVC_Attribute:
+		#define Entry( attribute, str ) case attribute:
 			GEN_DEFINE_ATTRIBUTE_TOKENS
 		#undef Entry
 			{
@@ -8906,55 +8741,36 @@ CodeBody parse_global_nspace( CodeT which )
 				// <Attributes>
 			}
 			//! Fallthrough intentional
-			case TokType::Spec_Consteval:
-			case TokType::Spec_Constexpr:
-			case TokType::Spec_Constinit:
-			case TokType::Spec_Extern:
-			case TokType::Spec_ForceInline:
-			case TokType::Spec_Global:
-			case TokType::Spec_Inline:
-			case TokType::Spec_Internal_Linkage:
-			case TokType::Spec_NeverInline:
-			case TokType::Spec_Static:
+			GEN_PARSER_CLASS_GLOBAL_NSPACE_ALLOWED_MEMBER_TOK_SPECIFIER_CASES:
 			{
-				SpecifierT specs_found[16] { ESpecifier::NumSpecifiers };
+				Specifier specs_found[16] = { Spec_NumSpecifiers };
 				s32        NumSpecifiers = 0;
 
-				while ( left && currtok.is_specifier() )
+				while ( left && tok_is_specifier(currtok) )
 				{
-					SpecifierT spec = ESpecifier::to_type( currtok );
+					Specifier spec = str_to_specifier( tok_to_str(currtok) );
 
 					bool ignore_spec = false;
 
 					switch ( spec )
 					{
-						case ESpecifier::Constexpr:
-						case ESpecifier::Constinit:
-						case ESpecifier::ForceInline:
-						case ESpecifier::Global:
-						case ESpecifier::External_Linkage:
-						case ESpecifier::Internal_Linkage:
-						case ESpecifier::Inline:
-						case ESpecifier::Mutable:
-						case ESpecifier::NeverInline:
-						case ESpecifier::Static:
-						case ESpecifier::Volatile:
+						GEN_PARSER_CLASS_GLOBAL_NSPACE_ALLOWED_MEMBER_SPECIFIER_CASES:
 						break;
 
-						case ESpecifier::Consteval:
+						case Spec_Consteval:
 							expects_function = true;
 						break;
 
-						case ESpecifier::Const:
+						case Spec_Const:
 							ignore_spec = true;
 						break;
 
 						default:
-							StrC spec_str = ESpecifier::to_str(spec);
+							Str spec_str = spec_to_str(spec);
 
-							log_failure( "Invalid specifier %.*s for variable\n%s", spec_str.Len, spec_str, Context.to_string() );
-							Context.pop();
-							return CodeInvalid;
+							log_failure( "Invalid specifier %S for variable\n%S", spec_str, strbuilder_to_str( parser_to_strbuilder(_ctx->parser)) );
+							parser_pop(& _ctx->parser);
+							return InvalidCode;
 					}
 
 					if (ignore_spec)
@@ -8972,53 +8788,57 @@ CodeBody parse_global_nspace( CodeT which )
 				// <Attributes> <Specifiers>
 			}
 			//! Fallthrough intentional
-			case TokType::Identifier:
-			case TokType::Spec_Const:
-			case TokType::Type_Long:
-			case TokType::Type_Short:
-			case TokType::Type_Signed:
-			case TokType::Type_Unsigned:
-			case TokType::Type_bool:
-			case TokType::Type_char:
-			case TokType::Type_double:
-			case TokType::Type_int:
+			case Tok_Identifier:
+			case Tok_Preprocess_Macro_Typename:
+			case Tok_Spec_Const:
+			case Tok_Type_Long:
+			case Tok_Type_Short:
+			case Tok_Type_Signed:
+			case Tok_Type_Unsigned:
+			case Tok_Type_bool:
+			case Tok_Type_char:
+			case Tok_Type_double:
+			case Tok_Type_int:
 			{
-				Code constructor_destructor = parse_global_nspace_constructor_destructor( specifiers );
-				// Possible constructor implemented at global file scope.
-				if ( constructor_destructor )
+				// This s only in a scope so that Preprocess_Macro_Bare_In_Body works without microsoft extension warnings
 				{
-					member = constructor_destructor;
-					break;
-				}
-
-				bool found_operator_cast_outside_class_implmentation = false;
-				s32  idx = Context.Tokens.Idx;
-
-				for ( ; idx < Context.Tokens.Arr.num(); idx++ )
-				{
-					Token tok = Context.Tokens[ idx ];
-
-					if ( tok.Type == TokType::Identifier )
+					Code constructor_destructor = parse_global_nspace_constructor_destructor( specifiers );
+					// Possible constructor implemented at global file scope.
+					if ( constructor_destructor )
 					{
-						idx++;
-						tok = Context.Tokens[ idx ];
-						if ( tok.Type == TokType::Access_StaticSymbol )
-							continue;
+						member = constructor_destructor;
+						break;
+					}
+
+					bool found_operator_cast_outside_class_implmentation = false;
+					s32  idx = _ctx->parser.Tokens.Idx;
+
+					for ( ; idx < array_num(_ctx->parser.Tokens.Arr); idx++ )
+					{
+						Token tok = _ctx->parser.Tokens.Arr[ idx ];
+
+						if ( tok.Type == Tok_Identifier )
+						{
+							idx++;
+							tok = _ctx->parser.Tokens.Arr[ idx ];
+							if ( tok.Type == Tok_Access_StaticSymbol )
+								continue;
+
+							break;
+						}
+
+						if ( tok.Type == Tok_Decl_Operator )
+							found_operator_cast_outside_class_implmentation = true;
 
 						break;
 					}
 
-					if ( tok.Type == TokType::Decl_Operator )
-						found_operator_cast_outside_class_implmentation = true;
-
-					break;
-				}
-
-				if ( found_operator_cast_outside_class_implmentation )
-				{
-					member = parse_operator_cast( specifiers );
-					// <Attributes> <Specifiers> <Name>::operator <Type>() { ... }
-					break;
+					if ( found_operator_cast_outside_class_implmentation )
+					{
+						member = cast(Code, parser_parse_operator_cast( specifiers ));
+						// <Attributes> <Specifiers> <Name>::operator <Type>() { ... }
+						break;
+					}
 				}
 
 				member = parse_operator_function_or_variable( expects_function, attributes, specifiers );
@@ -9026,22 +8846,22 @@ CodeBody parse_global_nspace( CodeT which )
 			}
 		}
 
-		if ( member == Code::Invalid )
+		if ( member == Code_Invalid )
 		{
-			log_failure( "Failed to parse member\n%s", Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "Failed to parse member\nToken: %SB\nContext:\n%SB", tok_to_strbuilder(currtok_noskip), parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 
 		// log_fmt("Global Body Member: %s", member->debug_str());
-		result.append( member );
+		body_append(result, member );
 	}
 
-	if ( which != Global_Body )
-		eat( TokType::BraceCurly_Close );
+	if ( which != CT_Global_Body )
+		eat( Tok_BraceCurly_Close );
 		// { <Body> }
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
@@ -9062,28 +8882,28 @@ Code parse_global_nspace_constructor_destructor( CodeSpecifiers specifiers )
 
 		TODO(Ed): We could fix this by attempting to parse a type, but we would have to have a way to have it soft fail and rollback.
 	*/
-	TokArray tokens = Context.Tokens;
+	TokArray tokens = _ctx->parser.Tokens;
 
 	s32   idx = tokens.Idx;
-	Token nav = tokens[ idx ];
-	for ( ; idx < tokens.Arr.num(); idx++, nav = tokens[ idx ] )
+	Token nav = tokens.Arr[ idx ];
+	for ( ; idx < array_num(tokens.Arr); idx++, nav = tokens.Arr[ idx ] )
 	{
-		if ( nav.Text[0] == '<' )
+		if ( nav.Text.Ptr[0] == '<' )
 		{
 			// Skip templated expressions as they mey have expressions with the () operators
 			s32 capture_level  = 0;
 			s32 template_level = 0;
-			for ( ; idx < tokens.Arr.num(); idx++, nav = tokens[idx] )
+			for ( ; idx < array_num(tokens.Arr); idx++, nav = tokens.Arr[idx] )
 			{
-				if (nav.Text[ 0 ] == '<')
+				if (nav.Text.Ptr[ 0 ] == '<')
 					++ template_level;
 
-				if (nav.Text[ 0 ] == '>')
+				if (nav.Text.Ptr[ 0 ] == '>')
 					-- template_level;
-				if (nav.Type == TokType::Operator && nav.Text[1] == '>')
+				if (nav.Type == Tok_Operator && nav.Text.Ptr[1] == '>')
 					-- template_level;
 
-				if ( nav.Type == ETokType::Capture_Start)
+				if ( nav.Type == Tok_Capture_Start)
 				{
 					if (template_level != 0 )
 						++ capture_level;
@@ -9091,42 +8911,42 @@ Code parse_global_nspace_constructor_destructor( CodeSpecifiers specifiers )
 						break;
 				}
 
-				if ( template_level != 0 && nav.Type == ETokType::Capture_End)
+				if ( template_level != 0 && nav.Type == Tok_Capture_End)
 					-- capture_level;
 			}
 		}
 
-		if ( nav.Type == TokType::Capture_Start )
+		if ( nav.Type == Tok_Capture_Start )
 			break;
 	}
 
 	-- idx;
-	Token tok_right = tokens[idx];
+	Token tok_right = tokens.Arr[idx];
 	Token tok_left  = NullToken;
 
-	if (tok_right.Type != TokType::Identifier)
+	if (tok_right.Type != Tok_Identifier)
 	{
 		// We're not dealing with a constructor if there is no identifier right before the opening of a parameter's scope.
 		return result;
 	}
 
 	-- idx;
-	tok_left = tokens[idx];
+	tok_left = tokens.Arr[idx];
 	// <Attributes> <Specifiers> ... <Identifier>
 
 	bool possible_destructor = false;
-	if ( tok_left.Type == TokType::Operator && tok_left.Text[0] == '~')
+	if ( tok_left.Type == Tok_Operator && tok_left.Text.Ptr[0] == '~')
 	{
 		possible_destructor = true;
 		-- idx;
-		tok_left = tokens[idx];
+		tok_left = tokens.Arr[idx];
 	}
 
-	if ( tok_left.Type != TokType::Access_StaticSymbol )
+	if ( tok_left.Type != Tok_Access_StaticSymbol )
 		return result;
 
 	-- idx;
-	tok_left = tokens[idx];
+	tok_left = tokens.Arr[idx];
 	// <Attributes> <Specifiers> ... :: <Identifier>
 
 	// We search toward the left until we find the next valid identifier
@@ -9134,39 +8954,39 @@ Code parse_global_nspace_constructor_destructor( CodeSpecifiers specifiers )
 	s32 template_level = 0;
 	while ( idx != tokens.Idx )
 	{
-		if (tok_left.Text[ 0 ] == '<')
+		if (tok_left.Text.Ptr[ 0 ] == '<')
 			++ template_level;
 
-		if (tok_left.Text[ 0 ] == '>')
+		if (tok_left.Text.Ptr[ 0 ] == '>')
 			-- template_level;
-		if (tok_left.Type == TokType::Operator && tok_left.Text[1] == '>')
+		if (tok_left.Type == Tok_Operator && tok_left.Text.Ptr[1] == '>')
 			-- template_level;
 
-		if ( template_level != 0 && tok_left.Type == ETokType::Capture_Start)
+		if ( template_level != 0 && tok_left.Type == Tok_Capture_Start)
 			++ capture_level;
 
-		if ( template_level != 0 && tok_left.Type == ETokType::Capture_End)
+		if ( template_level != 0 && tok_left.Type == Tok_Capture_End)
 			-- capture_level;
 
-		if ( capture_level == 0 && template_level == 0  && tok_left.Type == TokType::Identifier )
+		if ( capture_level == 0 && template_level == 0  && tok_left.Type == Tok_Identifier )
 			break;
 
 		-- idx;
-		tok_left = tokens[idx];
+		tok_left = tokens.Arr[idx];
 	}
 
-	bool is_same = str_compare( tok_right.Text, tok_left.Text, tok_right.Length ) == 0;
-	if (tok_left.Type == TokType::Identifier && is_same)
+	bool is_same = c_str_compare_len( tok_right.Text.Ptr, tok_left.Text.Ptr, tok_right.Text.Len ) == 0;
+	if (tok_left.Type == Tok_Identifier && is_same)
 	{
 		// We have found the pattern we desired
 		if (possible_destructor)
 		{
 			// <Name> :: ~<Name> (
-			result = parse_destructor( specifiers );
+			result = cast(Code, parser_parse_destructor( specifiers ));
 		}
 		else {
 			// <Name> :: <Name> (
-			result = parse_constructor( specifiers );
+			result = cast(Code, parser_parse_constructor( specifiers ));
 		}
 	}
 
@@ -9175,77 +8995,78 @@ Code parse_global_nspace_constructor_destructor( CodeSpecifiers specifiers )
 
 // TODO(Ed): I want to eventually change the identifier to its own AST type.
 // This would allow distinction of the qualifier for a symbol <qualifier>::<nested symboL>
-// This would also allow 
+// This would also allow
 internal
 Token parse_identifier( bool* possible_member_function )
 {
 	push_scope();
 
 	Token name = currtok;
-	Context.Scope->Name = name;
-	eat( TokType::Identifier );
+	_ctx->parser.Scope->Name = name.Text;
+	eat( Tok_Identifier );
 	// <Name>
 
-	parse_template_args( name );
+	parse_template_args( & name );
 	// <Name><Template Args>
 
-	while ( check( TokType::Access_StaticSymbol ) )
+	while ( check( Tok_Access_StaticSymbol ) )
 	{
-		eat( TokType::Access_StaticSymbol );
+		eat( Tok_Access_StaticSymbol );
 		// <Qualifier Name> <Template Args> ::
 
+		Token invalid = NullToken;
 		if ( left == 0 )
 		{
-			log_failure( "Error, unexpected end of static symbol identifier\n%s", Context.to_string() );
-			Context.pop();
-			return { nullptr, 0, TokType::Invalid };
+			log_failure( "Error, unexpected end of static symbol identifier\n%s", parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return invalid;
 		}
 
-		if ( currtok.Type == TokType::Operator && currtok.Text[0] == '~' )
+		if ( currtok.Type == Tok_Operator && currtok.Text.Ptr[0] == '~' )
 		{
-			bool is_destructor = str_compare( Context.Scope->Prev->ProcName, "parse_destructor" ) == 0;
+			bool is_destructor = str_are_equal( _ctx->parser.Scope->Prev->ProcName, txt("parser_parse_destructor"));
 			if (is_destructor)
 			{
-				name.Length = ( ( sptr )prevtok.Text + prevtok.Length ) - ( sptr )name.Text;
-				Context.pop();
+				name.Text.Len = ( ( sptr )prevtok.Text.Ptr + prevtok.Text.Len ) - ( sptr )name.Text.Ptr;
+				parser_pop(& _ctx->parser);
 				return name;
 			}
 
-			log_failure( "Error, had a ~ operator after %S but not a destructor\n%s", ETokType::to_str( prevtok.Type ), Context.to_string() );
-			Context.pop();
-			return { nullptr, 0, TokType::Invalid };
+			log_failure( "Error, had a ~ operator after %SB but not a destructor\n%s", toktype_to_str( prevtok.Type ), parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return invalid;
 		}
 
-		if ( currtok.Type == TokType::Operator && currtok.Text[0] == '*' && currtok.Length == 1 )
+		if ( currtok.Type == Tok_Operator && currtok.Text.Ptr[0] == '*' && currtok.Text.Len == 1 )
 		{
 			if ( possible_member_function )
 				*possible_member_function = true;
 
 			else
 			{
-				log_failure( "Found a member function pointer identifier but the parsing context did not expect it\n%s", Context.to_string() );
-				Context.pop();
-				return { nullptr, 0, TokType::Invalid };
+				log_failure( "Found a member function pointer identifier but the parsing context did not expect it\n%s", parser_to_strbuilder(_ctx->parser) );
+				parser_pop(& _ctx->parser);
+				return invalid;
 			}
 		}
 
-		if ( currtok.Type != TokType::Identifier )
+		if ( currtok.Type != Tok_Identifier )
 		{
-			log_failure( "Error, expected static symbol identifier, not %s\n%s", ETokType::to_str( currtok.Type ), Context.to_string() );
-			Context.pop();
-			return { nullptr, 0, TokType::Invalid };
+			log_failure( "Error, expected static symbol identifier, not %s\n%s", toktype_to_str( currtok.Type ), parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return invalid;
 		}
 
-		name.Length = ( (sptr)currtok.Text + currtok.Length ) - (sptr)name.Text;
-		eat( TokType::Identifier );
+		name.Text.Len = ( (sptr)currtok.Text.Ptr + currtok.Text.Len ) - (sptr)name.Text.Ptr;
+		eat( Tok_Identifier );
 		// <Qualifier Name> <Template Args> :: <Name>
 
-		parse_template_args( name );
+		parse_template_args( & name );
 		// <Qualifier Name> <Template Args> :: <Name> <Template Args>
 	}
 	// <Qualifier Name> <Template Args> :: <Name> <Template Args> ...
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return name;
 }
 
@@ -9256,23 +9077,23 @@ CodeInclude parse_include()
 
 	CodeInclude
 	include       = (CodeInclude) make_code();
-	include->Type = ECode::Preprocess_Include;
-	eat( TokType::Preprocess_Include );
+	include->Type = CT_Preprocess_Include;
+	eat( Tok_Preprocess_Include );
 	// #include
 
-	if ( ! check( TokType::String ))
+	if ( ! check( Tok_String ))
 	{
-		log_failure( "Error, expected include string after #include\n%s", Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
+		log_failure( "Error, expected include string after #include\n%s", parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 
-	Context.Scope->Name = currtok;
-	include->Content = get_cached_string( currtok );
-	eat( TokType::String );
+	_ctx->parser.Scope->Name = currtok.Text;
+	include->Content = cache_str( tok_to_str(currtok) );
+	eat( Tok_String );
 	// #include <Path> or "Path"
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return include;
 }
 
@@ -9281,302 +9102,301 @@ CodeOperator parse_operator_after_ret_type(
 	  ModuleFlag     mflags
 	, CodeAttributes attributes
 	, CodeSpecifiers specifiers
-	, CodeType       ret_type
+	, CodeTypename   ret_type
 )
 {
-	using namespace EOperator;
 	push_scope();
 
 	Token nspace = NullToken;
-	if ( check( TokType::Identifier ) )
+	if ( check( Tok_Identifier ) )
 	{
 		nspace = currtok;
-		while ( left && currtok.Type == TokType::Identifier )
+		while ( left && currtok.Type == Tok_Identifier )
 		{
-			eat( TokType::Identifier );
+			eat( Tok_Identifier );
 
-			if ( currtok.Type == TokType::Access_StaticSymbol )
-				eat( TokType::Access_StaticSymbol );
+			if ( currtok.Type == Tok_Access_StaticSymbol )
+				eat( Tok_Access_StaticSymbol );
 		}
 
-		nspace.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)nspace.Text;
+		nspace.Text.Len = ( (sptr)prevtok.Text.Ptr + prevtok.Text.Len ) - (sptr)nspace.Text.Ptr;
 	}
 	// <ExportFlag> <Attributes> <Specifiers> <ReturnType> <Qualifier::...>
 
-	eat( TokType::Decl_Operator );
+	eat( Tok_Decl_Operator );
 	// <ExportFlag> <Attributes> <Specifiers> <ReturnType> <Qualifier::...> operator
 
-	if ( ! left && currtok.Type != TokType::Operator
-		&& currtok.Type != TokType::Star
-		&& currtok.Type != TokType::Ampersand
-		&& currtok.Type != TokType::Ampersand_DBL )
+	if ( ! left && currtok.Type != Tok_Operator
+		&& currtok.Type != Tok_Star
+		&& currtok.Type != Tok_Ampersand
+		&& currtok.Type != Tok_Ampersand_DBL )
 	{
-		log_failure( "Expected operator after 'operator' keyword\n%s", Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
+		log_failure( "Expected operator after 'operator' keyword\n%s", parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 
-	Context.Scope->Name = currtok;
+	_ctx->parser.Scope->Name = currtok.Text;
 
 	bool was_new_or_delete = false;
 
-	OperatorT op = Invalid;
-	switch ( currtok.Text[0] )
+	Operator op = Op_Invalid;
+	switch ( currtok.Text.Ptr[0] )
 	{
 		case '+':
 		{
-			if ( currtok.Text[1] == '=' )
-				op = Assign_Add;
+			if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_Assign_Add;
 
-			else if ( currtok.Text[1] == '+' )
-				op = Increment;
+			else if ( currtok.Text.Ptr[1] == '+' )
+				op = Op_Increment;
 
 			else
-				op = Add;
+				op = Op_Add;
 		}
 		break;
 		case '-':
 		{
-			if ( currtok.Text[1] == '>' )
+			if ( currtok.Text.Ptr[1] == '>' )
 			{
-				if ( currtok.Text[2] == '*' )
-					op = MemberOfPointer;
+				if ( currtok.Text.Ptr[2] == '*' )
+					op = Op_MemberOfPointer;
 
 				else
-					op = MemberOfPointer;
+					op = Op_MemberOfPointer;
 
 				break;
 			}
 
-			else if ( currtok.Text[1] == '=' )
-				op = Assign_Subtract;
+			else if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_Assign_Subtract;
 
 			else
-				op = Subtract;
+				op = Op_Subtract;
 		}
 		break;
 		case '*':
 		{
-			if ( currtok.Text[1] == '=' )
-				op = Assign_Multiply;
+			if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_Assign_Multiply;
 
 			else
 			{
-				Token& finder = prevtok;
-				while ( finder.Type != TokType::Decl_Operator )
+				Token finder = prevtok;
+				while ( finder.Type != Tok_Decl_Operator )
 				{
-					if ( finder.Type == TokType::Identifier)
+					if ( finder.Type == Tok_Identifier)
 					{
-						op = Indirection;
+						op = Op_Indirection;
 						break;
 					}
 				}
 
-				if ( op == Invalid)
-					op = Multiply;
+				if ( op == Op_Invalid)
+					op = Op_Multiply;
 			}
 		}
 		break;
 		case '/':
 		{
-			if ( currtok.Text[1] == '=' )
-				op = Assign_Divide;
+			if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_Assign_Divide;
 
 			else
-				op = Divide;
+				op = Op_Divide;
 		}
 		break;
 		case '%':
 		{
-			if ( currtok.Text[1] == '=' )
-				op = Assign_Modulo;
+			if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_Assign_Modulo;
 
 			else
-				op = Modulo;
+				op = Op_Modulo;
 		}
 		break;
 		case '&':
 		{
-			if ( currtok.Text[1] == '=' )
-				op = Assign_BAnd;
+			if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_Assign_BAnd;
 
-			else if ( currtok.Text[1] == '&' )
-				op = LAnd;
+			else if ( currtok.Text.Ptr[1] == '&' )
+				op = Op_LAnd;
 
 			else
 			{
 
 
-				if ( op == Invalid )
-				op = BAnd;
+				if ( op == Op_Invalid )
+				op = Op_BAnd;
 			}
 		}
 		break;
 		case '|':
 		{
-			if ( currtok.Text[1] == '=' )
-				op = Assign_BOr;
+			if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_Assign_BOr;
 
-			else if ( currtok.Text[1] == '|' )
-				op = LOr;
+			else if ( currtok.Text.Ptr[1] == '|' )
+				op = Op_LOr;
 
 			else
-				op = BOr;
+				op = Op_BOr;
 		}
 		break;
 		case '^':
 		{
-			if ( currtok.Text[1] == '=' )
-				op = Assign_BXOr;
+			if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_Assign_BXOr;
 
 			else
-				op = BXOr;
+				op = Op_BXOr;
 		}
 		break;
 		case '~':
 		{
-			op = BNot;
+			op = Op_BNot;
 		}
 		break;
 		case '!':
 		{
-			if ( currtok.Text[1] == '=' )
-				op = LNot;
+			if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_LNot;
 
 			else
-				op = UnaryNot;
+				op = Op_UnaryNot;
 		}
 		break;
 		case '=':
 		{
-			if ( currtok.Text[1] == '=' )
-				op = LEqual;
+			if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_LEqual;
 
 			else
-				op = Assign;
+				op = Op_Assign;
 		}
 		break;
 		case '<':
 		{
-			if ( currtok.Text[1] == '=' )
-				op = LEqual;
+			if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_LesserEqual;
 
-			else if ( currtok.Text[1] == '<' )
+			else if ( currtok.Text.Ptr[1] == '<' )
 			{
-				if ( currtok.Text[2] == '=' )
-					op = Assign_LShift;
+				if ( currtok.Text.Ptr[2] == '=' )
+					op = Op_Assign_LShift;
 
 				else
-					op = LShift;
+					op = Op_LShift;
 			}
 			else
-				op = Lesser;
+				op = Op_Lesser;
 		}
 		break;
 		case '>':
 		{
-			if ( currtok.Text[1] == '=' )
-				op = GreaterEqual;
+			if ( currtok.Text.Ptr[1] == '=' )
+				op = Op_GreaterEqual;
 
-			else if ( currtok.Text[1] == '>' )
+			else if ( currtok.Text.Ptr[1] == '>' )
 			{
-				if ( currtok.Text[2] == '=' )
-					op = Assign_RShift;
+				if ( currtok.Text.Ptr[2] == '=' )
+					op = Op_Assign_RShift;
 
 				else
-					op = RShift;
+					op = Op_RShift;
 			}
 			else
-				op = Greater;
+				op = Op_Greater;
 		}
 		break;
 		case '(':
 		{
-			if ( currtok.Text[1] == ')' )
-				op = FunctionCall;
+			if ( currtok.Text.Ptr[1] == ')' )
+				op = Op_FunctionCall;
 
 			else
-				op = Invalid;
+				op = Op_Invalid;
 		}
 		break;
 		case '[':
 		{
-			if ( currtok.Text[1] == ']' )
-				op = Subscript;
+			if ( currtok.Text.Ptr[1] == ']' )
+				op = Op_Subscript;
 
 			else
-				op = Invalid;
+				op = Op_Invalid;
 		}
 		break;
 		default:
 		{
-			StrC str_new    = to_str(OperatorT::New);
-			StrC str_delete = to_str(OperatorT::Delete);
-			if ( str_compare( currtok.Text, str_new.Ptr, max(str_new.Len - 1, currtok.Length)) == 0)
+			Str c_str_new    = operator_to_str(Op_New);
+			Str c_str_delete = operator_to_str(Op_Delete);
+			if ( c_str_compare_len( currtok.Text.Ptr, c_str_new.Ptr, max(c_str_new.Len - 1, currtok.Text.Len)) == 0)
 			{
-				op = OperatorT::New;
-				eat( ETokType::Identifier );
+				op = Op_New;
+				eat( Tok_Identifier );
 				was_new_or_delete = true;
 
-				s32 idx = Context.Tokens.Idx + 1;
+				s32 idx = _ctx->parser.Tokens.Idx + 1;
 				{
-					while ( Context.Tokens[ idx ].Type == TokType::NewLine )
+					while ( _ctx->parser.Tokens.Arr[ idx ].Type == Tok_NewLine )
 						idx++;
 				}
-				Token next = Context.Tokens[idx];
-				if ( currtok.Type == TokType::Operator && str_compare(currtok.Text, "[]", 2) == 0)
+				Token next = _ctx->parser.Tokens.Arr[idx];
+				if ( currtok.Type == Tok_Operator && c_str_compare_len(currtok.Text.Ptr, "[]", 2) == 0)
 				{
-					eat(ETokType::Operator);
-					op = OperatorT::NewArray;
+					eat(Tok_Operator);
+					op = Op_NewArray;
 				}
-				else if ( currtok.Type == TokType::BraceSquare_Open && next.Type == TokType::BraceSquare_Close)
+				else if ( currtok.Type == Tok_BraceSquare_Open && next.Type == Tok_BraceSquare_Close)
 				{
-					eat(ETokType::BraceSquare_Open);
-					eat(ETokType::BraceSquare_Close);
-					op = OperatorT::NewArray;
+					eat(Tok_BraceSquare_Open);
+					eat(Tok_BraceSquare_Close);
+					op = Op_NewArray;
 				}
 			}
-			else if ( str_compare( currtok.Text, str_delete.Ptr, max(str_delete.Len - 1, currtok.Length )) == 0)
+			else if ( c_str_compare_len( currtok.Text.Ptr, c_str_delete.Ptr, max(c_str_delete.Len - 1, currtok.Text.Len )) == 0)
 			{
-				op = OperatorT::Delete;
-				eat(ETokType::Identifier);
+				op = Op_Delete;
+				eat(Tok_Identifier);
 				was_new_or_delete = true;
 
-				s32 idx = Context.Tokens.Idx + 1;
+				s32 idx = _ctx->parser.Tokens.Idx + 1;
 				{
-					while ( Context.Tokens[ idx ].Type == TokType::NewLine )
+					while ( _ctx->parser.Tokens.Arr[ idx ].Type == Tok_NewLine )
 						idx++;
 				}
-				Token next = Context.Tokens[idx];
-				if ( currtok.Type == TokType::Operator && str_compare(currtok.Text, "[]", 2) == 0)
+				Token next = _ctx->parser.Tokens.Arr[idx];
+				if ( currtok.Type == Tok_Operator && c_str_compare_len(currtok.Text.Ptr, "[]", 2) == 0)
 				{
-					eat(ETokType::Operator);
-					op = OperatorT::DeleteArray;
+					eat(Tok_Operator);
+					op = Op_DeleteArray;
 				}
-				else if ( currtok.Type == TokType::BraceSquare_Open && next.Type == TokType::BraceSquare_Close)
+				else if ( currtok.Type == Tok_BraceSquare_Open && next.Type == Tok_BraceSquare_Close)
 				{
-					eat(ETokType::BraceSquare_Open);
-					eat(ETokType::BraceSquare_Close);
-					op = OperatorT::DeleteArray;
+					eat(Tok_BraceSquare_Open);
+					eat(Tok_BraceSquare_Close);
+					op = Op_DeleteArray;
 				}
 			}
 			else
 			{
-				if ( op == Invalid )
+				if ( op == Op_Invalid )
 				{
-					log_failure( "Invalid operator '%s'\n%s", prevtok.Text, Context.to_string() );
-					Context.pop();
-					return CodeInvalid;
+					log_failure( "Invalid operator '%s'\n%s", prevtok.Text, parser_to_strbuilder(_ctx->parser) );
+					parser_pop(& _ctx->parser);
+					return InvalidCode;
 				}
 			}
 		}
 	}
 
-	if ( op == Invalid )
+	if ( op == Op_Invalid )
 	{
-		log_failure( "Invalid operator '%s'\n%s", currtok.Text, Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
+		log_failure( "Invalid operator '%s'\n%s", currtok.Text, parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 
 	if ( ! was_new_or_delete)
@@ -9584,57 +9404,57 @@ CodeOperator parse_operator_after_ret_type(
 	// <ExportFlag> <Attributes> <Specifiers> <ReturnType> <Qualifier::...> operator <Op>
 
 	// Parse Params
-	CodeParam params = parse_params();
+	CodeParams params = parse_params(parser_use_parenthesis);
 	// <ExportFlag> <Attributes> <Specifiers> <ReturnType> <Qualifier::...> operator <Op> ( <Parameters> )
 
-	if ( params.ast == nullptr && op == EOperator::Multiply )
-		op = MemberOfPointer;
+	if ( params == nullptr && op == Op_Multiply )
+		op = Op_MemberOfPointer;
 
-	while ( left && currtok.is_specifier() )
+	while ( left && tok_is_specifier(currtok) )
 	{
-		if ( specifiers.ast == nullptr )
+		if ( specifiers == nullptr )
 		{
-			specifiers = def_specifier( ESpecifier::to_type(currtok) );
+			specifiers = def_specifier( str_to_specifier( tok_to_str(currtok)) );
 			eat( currtok.Type );
 			continue;
 		}
 
-		specifiers.append( ESpecifier::to_type(currtok) );
+		specifiers_append(specifiers, str_to_specifier( tok_to_str(currtok)) );
 		eat( currtok.Type );
 	}
 	// <ExportFlag> <Attributes> <Specifiers> <ReturnType> <Qualifier::...> operator <Op> ( <Parameters> ) <Specifiers>
 
 	// Parse Body
 	CodeBody    body       = { nullptr };
-	CodeComment inline_cmt = NoCode;
-	if ( check( TokType::BraceCurly_Open ) )
+	CodeComment inline_cmt = NullCode;
+	if ( check( Tok_BraceCurly_Open ) )
 	{
-		body = parse_function_body();
-		if ( body == Code::Invalid )
+		body = cast(CodeBody, parse_function_body());
+		if ( cast(Code, body) == Code_Invalid )
 		{
-			Context.pop();
-			return CodeInvalid;
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 		// <ExportFlag> <Attributes> <Specifiers> <ReturnType> <Qualifier::...> operator <Op> ( <Parameters> ) <Specifiers> { ... }
 	}
 	else
 	{
 		Token stmt_end = currtok;
-		eat( TokType::Statement_End );
+		eat( Tok_Statement_End );
 		// <ExportFlag> <Attributes> <Specifiers> <ReturnType> <Qualifier::...> operator <Op> ( <Parameters> ) <Specifiers>;
 
-		if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
+		if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
 			inline_cmt = parse_comment();
 			// <ExportFlag> <Attributes> <Specifiers> <ReturnType> <Qualifier::...> operator <Op> ( <Parameters> ) <Specifiers>; <InlineCmt>
 	}
 
 	// OpValidateResult check_result = operator__validate( op, params, ret_type, specifiers );
-	CodeOperator result = def_operator( op, nspace, params, ret_type, body, specifiers, attributes, mflags );
+	CodeOperator result = def_operator( op, tok_to_str(nspace), def_assign( params, ret_type, body, specifiers, attributes, mflags ) );
 
 	if ( inline_cmt )
 		result->InlineCmt = inline_cmt;
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
@@ -9643,46 +9463,40 @@ Code parse_operator_function_or_variable( bool expects_function, CodeAttributes
 {
 	push_scope();
 
-	Code result = CodeInvalid;
+	Code result = InvalidCode;
 
-#ifndef GEN_PARSER_DISABLE_MACRO_FUNCTION_SIGNATURES
-	if ( currtok.Type == TokType::Preprocess_Macro )
-	{
-		// Were dealing with a macro after attributes/specifiers.
-		result = parse_simple_preprocess( TokType::Preprocess_Macro );
-		Context.pop();
-		return result;
-		// <Attributes> <Specifiers> <Macro>
+	Code macro_stmt = parse_macro_as_definiton(attributes, specifiers);
+	if (macro_stmt) {
+		parser_pop(& _ctx->parser);
+		return macro_stmt;
 	}
-#endif
 
-	CodeType type = parse_type();
+	CodeTypename type = parser_parse_type( parser_not_from_template, nullptr );
 	// <Attributes> <Specifiers> <ReturnType/ValueType>
 
-	if ( type == CodeInvalid )
-	{
-		Context.pop();
-		return CodeInvalid;
+	if ( type == InvalidCode ) {
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 
 	bool found_operator = false;
-	s32  idx            = Context.Tokens.Idx;
+	s32  idx            = _ctx->parser.Tokens.Idx;
 
-	for ( ; idx < Context.Tokens.Arr.num(); idx++ )
+	for ( ; idx < array_num(_ctx->parser.Tokens.Arr); idx++ )
 	{
-		Token tok = Context.Tokens[ idx ];
+		Token tok = _ctx->parser.Tokens.Arr[ idx ];
 
-		if ( tok.Type == TokType::Identifier )
+		if ( tok.Type == Tok_Identifier )
 		{
 			idx++;
-			tok = Context.Tokens[ idx ];
-			if ( tok.Type == TokType::Access_StaticSymbol )
+			tok = _ctx->parser.Tokens.Arr[ idx ];
+			if ( tok.Type == Tok_Access_StaticSymbol )
 				continue;
 
 			break;
 		}
 
-		if ( tok.Type == TokType::Decl_Operator )
+		if ( tok.Type == Tok_Decl_Operator )
 			found_operator = true;
 
 		break;
@@ -9691,43 +9505,71 @@ Code parse_operator_function_or_variable( bool expects_function, CodeAttributes
 	if ( found_operator )
 	{
 		// Dealing with an operator overload
-		result = parse_operator_after_ret_type( ModuleFlag::None, attributes, specifiers, type );
+		result = cast(Code, parse_operator_after_ret_type( ModuleFlag_None, attributes, specifiers, type ));
 		// <Attributes> <Specifiers> <ReturnType> operator ...
 	}
 	else
 	{
-		Token name = parse_identifier();
-		Context.Scope->Name = name;
+		Token name = parse_identifier(nullptr);
+		_ctx->parser.Scope->Name = name.Text;
 
-		bool detected_capture = check( TokType::Capture_Start );
+		bool detected_capture = check( Tok_Capture_Start );
 
 		// Check three tokens ahead to make sure that were not dealing with a constructor initialization...
 		//                  (         350.0f    ,         <---  Could be the scenario
 		// Example : <Capture_Start> <Value> <Comma>
 		//                 idx         +1      +2
-		bool detected_comma = Context.Tokens.Arr[ Context.Tokens.Idx + 2 ].Type == TokType::Comma;
-		if ( detected_capture && ! detected_comma )
+		bool detected_comma = _ctx->parser.Tokens.Arr[ _ctx->parser.Tokens.Idx + 2 ].Type == Tok_Comma;
+		if ( detected_capture && ! detected_comma ) 
 		{
 			// Dealing with a function
-			result = parse_function_after_name( ModuleFlag::None, attributes, specifiers, type, name );
+			result = cast(Code, parse_function_after_name( ModuleFlag_None, attributes, specifiers, type, name ));
 			// <Attributes> <Specifiers> <ReturnType> <Name> ( ...
 		}
 		else
 		{
-			if ( expects_function )
-			{
-				log_failure( "Expected function declaration (consteval was used)\n%s", Context.to_string() );
-				Context.pop();
-				return CodeInvalid;
+			if ( expects_function ) {
+				log_failure( "Expected function declaration (consteval was used)\n%s", parser_to_strbuilder(_ctx->parser) );
+				parser_pop(& _ctx->parser);
+				return InvalidCode;
 			}
-
 			// Dealing with a variable
-			result = parse_variable_after_name( ModuleFlag::None, attributes, specifiers, type, name );
+			result = cast(Code, parse_variable_after_name( ModuleFlag_None, attributes, specifiers, type, tok_to_str(name) ));
 			// <Attributes> <Specifiers> <ValueType> <Name> ...
 		}
 	}
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
+	return result;
+}
+
+internal
+Code parse_macro_as_definiton( CodeAttributes attributes, CodeSpecifiers specifiers )
+{
+	push_scope();
+
+	if (currtok.Type != Tok_Preprocess_Macro_Stmt ) {
+		parser_pop(& _ctx->parser);
+		return NullCode;
+	}
+	Macro* macro                     = lookup_macro(currtok.Text);
+	b32    can_resolve_to_definition = macro && bitfield_is_set(MacroFlags, macro->Flags, MF_Allow_As_Definition);
+	if ( ! can_resolve_to_definition) {
+		parser_pop(& _ctx->parser);
+		return NullCode;
+	}
+
+	// TODO(Ed): When AST_Macro is made, have it support attributs and specifiers for when its behaving as a declaration/definition.
+	Code code = parse_simple_preprocess( Tok_Preprocess_Macro_Stmt );
+
+	// Attributes and sepcifiers will be collapsed into the macro's serialization.
+	StrBuilder resolved_definition = strbuilder_fmt_buf(_ctx->Allocator_Temp, "%S %S %S"
+		, attributes ? strbuilder_to_str( attributes_to_strbuilder(attributes)) : txt("")
+		, specifiers ? strbuilder_to_str( specifiers_to_strbuilder(specifiers)) : txt("")
+		, code->Content
+	);
+	Code result = untyped_str( strbuilder_to_str(resolved_definition) );
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
@@ -9738,165 +9580,164 @@ CodePragma parse_pragma()
 
 	CodePragma
 	pragma       = (CodePragma) make_code();
-	pragma->Type = ECode::Preprocess_Pragma;
-	eat( TokType::Preprocess_Pragma );
+	pragma->Type = CT_Preprocess_Pragma;
+	eat( Tok_Preprocess_Pragma );
 	// #pragma
 
-	if ( ! check( TokType::Preprocess_Content ))
-	{
-		log_failure( "Error, expected content after #pragma\n%s", Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
+	if ( ! check( Tok_Preprocess_Content )) {
+		log_failure( "Error, expected content after #pragma\n%s", parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 
-	Context.Scope->Name = currtok;
+	_ctx->parser.Scope->Name = currtok.Text;
 
-	pragma->Content = get_cached_string( currtok );
-	eat( TokType::Preprocess_Content );
+	pragma->Content = cache_str( tok_to_str(currtok) );
+	eat( Tok_Preprocess_Content );
 	// #pragma <Content>
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return pragma;
 }
 
 internal inline
-CodeParam parse_params( bool use_template_capture )
+CodeParams parse_params( bool use_template_capture )
 {
-	using namespace ECode;
 	push_scope();
 
-	if ( ! use_template_capture )
-		eat( TokType::Capture_Start );
-	// (
-
-	else
-	{
-		if ( check( TokType::Operator ) && currtok.Text[ 0 ] == '<' )
-			eat( TokType::Operator );
-		// <
+	if ( ! use_template_capture ) {
+		eat( Tok_Capture_Start );
+		// (
+	}
+	else {
+		if ( check( Tok_Operator ) && currtok.Text.Ptr[ 0 ] == '<' )
+			eat( Tok_Operator );
+			// <
 	}
 
-	if ( ! use_template_capture && check( TokType::Capture_End ) )
+	if ( ! use_template_capture && check( Tok_Capture_End ) )
 	{
-		eat( TokType::Capture_End );
+		eat( Tok_Capture_End );
 		// )
-		Context.pop();
-		return { nullptr };
+		parser_pop(& _ctx->parser);
+		return NullCode;
 	}
-	else if ( check( TokType::Operator ) && currtok.Text[ 0 ] == '>' )
+	else if ( check( Tok_Operator ) && currtok.Text.Ptr[ 0 ] == '>' ) 
 	{
-		eat( TokType::Operator );
+		eat( Tok_Operator );
 		// >
-		Context.pop();
-		return { nullptr };
+		parser_pop(& _ctx->parser);
+		return NullCode;
 	}
 
-	Code     macro           = { nullptr };
-	CodeType type            = { nullptr };
-	Code     value           = { nullptr };
-	Token    name            = NullToken;
-	Code     post_name_macro = { nullptr };
+	Code         macro           = { nullptr };
+	CodeTypename type            = { nullptr };
+	Code         value           = { nullptr };
+	Token        name            = NullToken;
+	Code         post_name_macro = { nullptr };
 
-	if ( check( TokType::Varadic_Argument ) )
+	if ( check( Tok_Varadic_Argument ) )
 	{
-		eat( TokType::Varadic_Argument );
+		eat( Tok_Varadic_Argument );
 		// ( or <  ...
 
-		Context.pop();
+		parser_pop(& _ctx->parser);
 		return param_varadic;
 		// ( ... )
 		// or < ... >
 	}
 
 	#define CheckEndParams() \
-		(use_template_capture ? (currtok.Text[ 0 ] != '>') : (currtok.Type != TokType::Capture_End))
+		(use_template_capture ? (currtok.Text.Ptr[ 0 ] != '>') : (currtok.Type != Tok_Capture_End))
 
+	// TODO(Ed): Use expression macros or this? macro as attribute?
 	// Ex: Unreal has this type of macro:                 vvvvvvvvv
 	// COREUOBJECT_API void CallFunction( FFrame& Stack, RESULT_DECL, UFunction* Function );
 	// and:                 vvvv
 	// AddComponentByClass(UPARAM(meta = (AllowAbstract = "false")) TSubclassOf<UActorComponent> Class, bool bManualAttachment, ...
-	if ( check(TokType::Preprocess_Macro))
+	if ( check(Tok_Preprocess_Macro_Expr))
 	{
-		macro = parse_simple_preprocess(ETokType::Preprocess_Macro);
+		macro = parse_simple_preprocess(Tok_Preprocess_Macro_Expr);
 		// ( <Macro>
 	}
-	if ( currtok.Type != TokType::Comma )
+	if ( currtok.Type != Tok_Comma )
 	{
-		type = parse_type( use_template_capture );
-		if ( type == Code::Invalid )
+		type = parser_parse_type( use_template_capture, nullptr );
+		if ( cast(Code, type) == Code_Invalid )
 		{
-			Context.pop();
-			return CodeInvalid;
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 		// ( <Macro> <ValueType>
 
-		if ( check( TokType::Identifier ) )
+		if ( check( Tok_Identifier ) )
 		{
 			name = currtok;
-			eat( TokType::Identifier );
+			eat( Tok_Identifier );
 			// ( <Macro> <ValueType> <Name>
 		}
 
+		// TODO(Ed): Use expression macro for this?
 		// Unreal has yet another type of macro:
 		// template<class T UE_REQUIRES(TPointerIsConvertibleFromTo<T, UInterface>::Value)>
 		// class T ... and then ^this^ UE_REQUIRES shows up
 		// So we need to consume that.
-		if ( check( TokType::Preprocess_Macro ))
+		if ( check( Tok_Preprocess_Macro_Expr ))
 		{
-			post_name_macro = parse_simple_preprocess( ETokType::Preprocess_Macro );
+			post_name_macro = parse_simple_preprocess( Tok_Preprocess_Macro_Expr );
+			// ( <Macro> <ValueType> <Name> <PostNameMacro>
 		}
 
 		// In template captures you can have a typename have direct assignment without a name
 		// typename = typename ...
 		// Which would result in a static value type from a struct expansion (traditionally)
-		if ( ( name.Text || use_template_capture ) && bitfield_is_equal( u32, currtok.Flags, TF_Assign ) )
+		if ( ( name.Text.Ptr || use_template_capture ) && bitfield_is_set( u32, currtok.Flags, TF_Assign ) )
 		{
-			eat( TokType::Operator );
-			// ( <Macro> <ValueType> <Name> =
+			eat( Tok_Operator );
+			// ( <Macro> <ValueType> <Name>  =
 
 			Token value_tok = currtok;
 
-			if ( currtok.Type == TokType::Comma )
-			{
-				log_failure( "Expected value after assignment operator\n%s.", Context.to_string() );
-				Context.pop();
-				return CodeInvalid;
+			if ( currtok.Type == Tok_Comma ) {
+				log_failure( "Expected value after assignment operator\n%s.", parser_to_strbuilder(_ctx->parser) );
+				parser_pop(& _ctx->parser);
+				return InvalidCode;
 			}
 
 			s32 capture_level  = 0;
 			s32 template_level = 0;
-			while ( (left && ( currtok.Type != TokType::Comma ) && template_level >= 0 && CheckEndParams()) || (capture_level > 0 || template_level > 0) )
+			while ( (left && ( currtok.Type != Tok_Comma ) && template_level >= 0 && CheckEndParams()) || (capture_level > 0 || template_level > 0) )
 			{
-				if (currtok.Text[ 0 ] == '<')
+				if (currtok.Text.Ptr[ 0 ] == '<')
 					++ template_level;
 
-				if (currtok.Text[ 0 ] == '>')
+				if (currtok.Text.Ptr[ 0 ] == '>')
 					-- template_level;
-				if (currtok.Type == TokType::Operator && currtok.Text[1] == '>')
+				if (currtok.Type == Tok_Operator && currtok.Text.Ptr[1] == '>')
 					-- template_level;
 
-				if ( currtok.Type == ETokType::Capture_Start)
+				if ( currtok.Type == Tok_Capture_Start)
 					++ capture_level;
 
-				if ( currtok.Type == ETokType::Capture_End)
+				if ( currtok.Type == Tok_Capture_End)
 					-- capture_level;
 
-				value_tok.Length = ( ( sptr )currtok.Text + currtok.Length ) - ( sptr )value_tok.Text;
+				value_tok.Text.Len = ( ( sptr )currtok.Text.Ptr + currtok.Text.Len ) - ( sptr )value_tok.Text.Ptr;
 				eat( currtok.Type );
 			}
 
-			value = untyped_str( strip_formatting( value_tok, strip_formatting_dont_preserve_newlines ) );
+			value = untyped_str( strbuilder_to_str(parser_strip_formatting( tok_to_str(value_tok), parser_strip_formatting_dont_preserve_newlines )) );
 			// ( <Macro> <ValueType> <Name> = <Expression>
 		}
 	}
 
-	CodeParam result = ( CodeParam )make_code();
-	result->Type     = Parameters;
+	CodeParams result = ( CodeParams )make_code();
+	result->Type     = CT_Parameters;
 
 	result->Macro = macro;
 
-	if ( name.Length > 0 )
-		result->Name = get_cached_string( name );
+	if ( name.Text.Len > 0 )
+		result->Name = cache_str( tok_to_str(name) );
 
 	result->ValueType = type;
 
@@ -9905,18 +9746,18 @@ CodeParam parse_params( bool use_template_capture )
 
 	result->NumEntries++;
 
-	while ( check(TokType::Comma) )
+	while ( check(Tok_Comma) )
 	{
-		eat( TokType::Comma );
+		eat( Tok_Comma );
 		// ( <Macro> <ValueType> <Name> = <Expression>,
 
 		Code type  = { nullptr };
 		Code value = { nullptr };
 
-		if ( check( TokType::Varadic_Argument ) )
+		if ( check( Tok_Varadic_Argument ) )
 		{
-			eat( TokType::Varadic_Argument );
-			result.append( param_varadic );
+			eat( Tok_Varadic_Argument );
+			params_append(result, param_varadic );
 			continue;
 			// ( <Macro> <ValueType> <Name> = <Expression>, ...
 		}
@@ -9925,27 +9766,27 @@ CodeParam parse_params( bool use_template_capture )
 		// COREUOBJECT_API void CallFunction( FFrame& Stack, RESULT_DECL, UFunction* Function );
 		// and:                 vvvv
 		// AddComponentByClass(UPARAM(meta = (AllowAbstract = "false")) TSubclassOf<UActorComponent> Class, bool bManualAttachment, ...
-		if ( check(TokType::Preprocess_Macro))
+		if ( check(Tok_Preprocess_Macro_Expr))
 		{
-			macro = parse_simple_preprocess(ETokType::Preprocess_Macro);
-			// ( <Macro>
+			macro = parse_simple_preprocess(Tok_Preprocess_Macro_Expr);
+			// ( <Macro> <ValueType> <Name> = <Expression>, <Macro>
 		}
-		if ( currtok.Type != TokType::Comma )
+		if ( currtok.Type != Tok_Comma )
 		{
-			type = parse_type( use_template_capture );
-			if ( type == Code::Invalid )
+			type = cast(Code, parser_parse_type( use_template_capture, nullptr ));
+			if ( type == Code_Invalid )
 			{
-				Context.pop();
-				return CodeInvalid;
+				parser_pop(& _ctx->parser);
+				return InvalidCode;
 			}
 			// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType>
 
-			name = { nullptr, 0, TokType::Invalid, false };
+			name = NullToken;
 
-			if ( check( TokType::Identifier ) )
+			if ( check( Tok_Identifier ) )
 			{
 				name = currtok;
-				eat( TokType::Identifier );
+				eat( Tok_Identifier );
 				// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name>
 			}
 
@@ -9953,93 +9794,91 @@ CodeParam parse_params( bool use_template_capture )
 			// template<class T UE_REQUIRES(TPointerIsConvertibleFromTo<T, UInterface>::Value)>
 			// class T ... and then ^this^ UE_REQUIRES shows up
 			// So we need to consume that.
-			if ( check( TokType::Preprocess_Macro ))
-			{
-				post_name_macro = parse_simple_preprocess( ETokType::Preprocess_Macro );
+			if ( check( Tok_Preprocess_Macro_Expr )) {
+				post_name_macro = parse_simple_preprocess( Tok_Preprocess_Macro_Expr );
+				// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <PostNameMacro>
 			}
 
 			// In template captures you can have a typename have direct assignment without a name
 			// typename = typename ...
 			// Which would result in a static value type from a struct expansion (traditionally)
-			if ( ( name.Text || use_template_capture ) && bitfield_is_equal( u32, currtok.Flags, TF_Assign ) )
+			if ( ( name.Text.Ptr || use_template_capture ) && bitfield_is_set( u32, currtok.Flags, TF_Assign ) )
 			{
-				eat( TokType::Operator );
-				// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> =
+				eat( Tok_Operator );
+				// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> <PostNameMacro> =
 
 				Token value_tok = currtok;
 
-				if ( currtok.Type == TokType::Comma )
-				{
-					log_failure( "Expected value after assignment operator\n%s", Context.to_string() );
-					Context.pop();
-					return CodeInvalid;
+				if ( currtok.Type == Tok_Comma ) {
+					log_failure( "Expected value after assignment operator\n%s", parser_to_strbuilder(_ctx->parser) );
+					parser_pop(& _ctx->parser);
+					return InvalidCode;
 				}
 
 				s32 capture_level  = 0;
 				s32 template_level = 0;
 				while ( (left
-				&& currtok.Type != TokType::Comma
+				&& currtok.Type != Tok_Comma
 				&& template_level >= 0
 				&& CheckEndParams()) || (capture_level > 0 || template_level > 0) )
 				{
-					if (currtok.Text[ 0 ] == '<')
+					if (currtok.Text.Ptr[ 0 ] == '<')
 						++ template_level;
 
-					if (currtok.Text[ 0 ] == '>')
+					if (currtok.Text.Ptr[ 0 ] == '>')
 						-- template_level;
-					if (currtok.Type == TokType::Operator && currtok.Text[1] == '>')
+					if (currtok.Type == Tok_Operator && currtok.Text.Ptr[1] == '>')
 						-- template_level;
 
-					if ( currtok.Type == ETokType::Capture_Start)
+					if ( currtok.Type == Tok_Capture_Start)
 						++ capture_level;
 
-					if ( currtok.Type == ETokType::Capture_End)
+					if ( currtok.Type == Tok_Capture_End)
 						-- capture_level;
 
-					value_tok.Length = ( ( sptr )currtok.Text + currtok.Length ) - ( sptr )value_tok.Text;
+					value_tok.Text.Len = ( ( sptr )currtok.Text.Ptr + currtok.Text.Len ) - ( sptr )value_tok.Text.Ptr;
 					eat( currtok.Type );
 				}
 
-				value = untyped_str( strip_formatting( value_tok, strip_formatting_dont_preserve_newlines ) );
-				// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> = <Expression>
+				value = untyped_str( strbuilder_to_str(parser_strip_formatting( tok_to_str(value_tok), parser_strip_formatting_dont_preserve_newlines )) );
+				// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> <PostNameMacro> = <Expression>
 			}
-			// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> = <Expression>, ..
+			// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> <PostNameMacro> = <Expression>, ..
 		}
 
-		CodeParam param = ( CodeParam )make_code();
-		param->Type     = Parameters;
+		CodeParams param = ( CodeParams )make_code();
+		param->Type     = CT_Parameters;
 
 		param->Macro = macro;
 
-		if ( name.Length > 0 )
-			param->Name = get_cached_string( name );
+		if ( name.Text.Len > 0 )
+			param->Name = cache_str( tok_to_str(name) );
 
 		param->PostNameMacro = post_name_macro;
-		param->ValueType     = type;
+		param->ValueType     = cast(CodeTypename, type);
 
 		if ( value )
 			param->Value = value;
 
-		result.append( param );
+		params_append(result, param );
 	}
 
 	if ( ! use_template_capture )
-		eat( TokType::Capture_End );
-	// ( <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> = <Expression>, .. )
-
+	{
+		eat( Tok_Capture_End );
+		// ( <Macro> <ValueType> <Name> <PostNameMacro> = <Expression>, <Macro> <ValueType> <Name> <PostNameMacro> = <Expression>, .. )
+	}
 	else
 	{
-		if ( ! check( TokType::Operator ) || currtok.Text[ 0 ] != '>' )
-		{
-			log_failure( "Expected '<' after 'template' keyword\n%s", Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+		if ( ! check( Tok_Operator ) || currtok.Text.Ptr[ 0 ] != '>' ) {
+			log_failure( "Expected '<' after 'template' keyword\n%s", parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
-		eat( TokType::Operator );
-		// < <Macro> <ValueType> <Name> = <Expression>, <Macro> <ValueType> <Name> = <Expression>, .. >
+		eat( Tok_Operator );
+		// < <Macro> <ValueType> <Name> <PostNameMacro> = <Expression>, <Macro> <ValueType> <Name> <PostNameMacro> = <Expression>, .. >
 	}
-
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 #undef context
 }
@@ -10049,36 +9888,36 @@ CodePreprocessCond parse_preprocess_cond()
 {
 	push_scope();
 
-	if ( ! currtok.is_preprocess_cond() )
+	if ( ! tok_is_preprocess_cond(currtok) )
 	{
-		log_failure( "Error, expected preprocess conditional\n%s", Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
+		log_failure( "Error, expected preprocess conditional\n%s", parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 
 	CodePreprocessCond
 	cond       = (CodePreprocessCond) make_code();
-	cond->Type = scast(CodeT, currtok.Type - ( TokType::Preprocess_If - ECode::Preprocess_If ) );
+	cond->Type = scast(CodeType, currtok.Type - ( Tok_Preprocess_If - CT_Preprocess_If ) );
 	eat( currtok.Type );
 	// #<Conditional>
 
-	if ( ! check( TokType::Preprocess_Content ))
+	if ( ! check( Tok_Preprocess_Content ))
 	{
-		log_failure( "Error, expected content after #define\n%s", Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
+		log_failure( "Error, expected content after #define\n%s", parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 
-	Context.Scope->Name = currtok;
-	cond->Content = get_cached_string( currtok );
-	eat( TokType::Preprocess_Content );
+	_ctx->parser.Scope->Name = currtok.Text;
+	cond->Content = cache_str( tok_to_str(currtok) );
+	eat( Tok_Preprocess_Content );
 	// #<Conditiona> <Content>
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return cond;
 }
 
-internal inline
+internal
 Code parse_simple_preprocess( TokType which )
 {
 	// TODO(Ed): We can handle a macro a bit better than this. It's AST can be made more robust..
@@ -10086,73 +9925,128 @@ Code parse_simple_preprocess( TokType which )
 	// If we want it to terminate or have an inline comment we can possbily use its parent typedef for that info...
 	push_scope();
 
-	Token tok = currtok;
+	Token full_macro = currtok;
 	eat( which );
 	// <Macro>
 
-	if ( currtok.Type == TokType::BraceCurly_Open )
-	{
-		// Eat the block scope right after the macro. Were assuming the macro defines a function definition's signature
-		eat( TokType::BraceCurly_Open );
-		// <Macro> {
+	Macro* macro = lookup_macro( full_macro.Text );
+	if ( which != Tok_Preprocess_Unsupported && macro == nullptr ) {
+		log_failure("Expected the macro %S to be registered\n%S", full_macro,  parser_to_strbuilder(_ctx->parser));
+		return NullCode;
+	}
+
+	// TODO(Ed) : Parse this properly later (expression and statement support)
+	if ( macro && macro_is_functional(* macro) )
+	{
+		eat( Tok_Capture_Start );
 
-		// TODO(Ed) : Parse this properly later (expression and statement support)
 		s32 level = 0;
-		while ( left && ( currtok.Type != TokType::BraceCurly_Close || level > 0 ) )
+		while ( left && ( currtok.Type != Tok_Capture_End || level > 0 ) )
 		{
-			if ( currtok.Type == TokType::BraceCurly_Open )
+			if ( currtok.Type == Tok_Capture_Start )
 				level++;
 
-			else if ( currtok.Type == TokType::BraceCurly_Close && level > 0 )
+			else if ( currtok.Type == Tok_Capture_End && level > 0 )
 				level--;
 
 			eat( currtok.Type );
 		}
-		eat( TokType::BraceCurly_Close );
+		eat( Tok_Capture_End );
+		// <Macro> ( <params> )
+
+		full_macro.Text.Len = ( (sptr)prevtok.Text.Ptr + prevtok.Text.Len ) - (sptr)full_macro.Text.Ptr;
+	}
+
+	if ( macro && macro_expects_body(* macro) && peektok.Type == Tok_BraceCurly_Open )
+	{
+		// Eat the block scope right after the macro. Were assuming the macro defines a function definition's signature
+		eat( Tok_BraceCurly_Open );
+		// <Macro> {
+
+		// TODO(Ed) : Parse this properly later (expression and statement support)
+		s32 level = 0;
+		while ( left && ( currtok.Type != Tok_BraceCurly_Close || level > 0 ) )
+		{
+			if ( currtok.Type == Tok_BraceCurly_Open )
+				level++;
+
+			else if ( currtok.Type == Tok_BraceCurly_Close && level > 0 )
+				level--;
+
+			eat( currtok.Type );
+		}
+		eat( Tok_BraceCurly_Close );
 		// <Macro> { <Body> }
 
-		StrC prev_proc = Context.Scope->Prev->ProcName;
-		if ( str_compare( prev_proc.Ptr, "parse_typedef", prev_proc.Len ) != 0 )
+		// TODO(Ed): Review this?
+		Str prev_proc = _ctx->parser.Scope->Prev->ProcName;
+		if ( macro->Type == MT_Typename && c_str_compare_len( prev_proc.Ptr, "parser_parse_typedef", prev_proc.Len ) != 0 )
 		{
-			if ( check( TokType::Statement_End ))
+			if ( check( Tok_Statement_End ))
 			{
 				Token stmt_end = currtok;
-				eat( TokType::Statement_End );
+				eat( Tok_Statement_End );
 				// <Macro> { <Content> };
 
-				if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
-					eat( TokType::Comment );
+				if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
+					eat( Tok_Comment );
 					// <Macro> { <Content> }; <InlineCmt>
 			}
 		}
 
-		tok.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)tok.Text;
+		full_macro.Text.Len = ( (sptr)prevtok.Text.Ptr + prevtok.Text.Len ) - (sptr)full_macro.Text.Ptr;
 	}
 	else
 	{
-		if ( str_compare( Context.Scope->Prev->ProcName.Ptr, "parse_typedef", Context.Scope->Prev->ProcName.Len ) != 0 )
+		// If the macro is just a macro in the body of an AST it may have a semi-colon for the user to close on purpsoe
+		// (especially for functional macros)
+		Str calling_proc = _ctx->parser.Scope->Prev->ProcName;
+
+		if (str_contains(_ctx->parser.Scope->Prev->ProcName, txt("parser_parse_enum")))
 		{
-			if ( check( TokType::Statement_End ))
+			// Do nothing
+			goto Leave_Scope_Early;
+		}
+		else if (macro && macro->Type == MT_Typename && str_contains(_ctx->parser.Scope->Prev->ProcName, txt("parser_parse_typedef")))
+		{
+			if ( peektok.Type == Tok_Statement_End )
 			{
 				Token stmt_end = currtok;
-				eat( TokType::Statement_End );
+				eat( Tok_Statement_End );
 				// <Macro>;
 
-				if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
-					eat( TokType::Comment );
+				full_macro.Text.Len += prevtok.Text.Len;
+
+				// TODO(Ed): Reveiw the context for this? (ESPECIALLY THIS)
+				if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
+				{
+					eat( Tok_Comment );
 					// <Macro>; <InlineCmt>
+
+					full_macro.Text.Len += prevtok.Text.Len;
+				}
+			}
+		}
+		else if (
+				str_contains(calling_proc, txt("parse_global_nspace"))
+			||	str_contains(calling_proc, txt("parse_class_struct_body"))
+		)
+		{
+			if (peektok.Type == Tok_Statement_End)
+			{
+				Token stmt_end = currtok;
+				eat( Tok_Statement_End );
+				// <Macro>;
+				full_macro.Text.Len += prevtok.Text.Len;
 			}
 		}
-
-		tok.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)tok.Text;
 	}
 
-	char const* content = str_fmt_buf( "%.*s ", tok.Length, tok.Text );
+Leave_Scope_Early:
+	Code result = untyped_str( full_macro.Text );
+	_ctx->parser.Scope->Name = full_macro.Text;
 
-	Code result = untyped_str( to_str( content ) );
-	Context.Scope->Name = tok;
-
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
@@ -10163,38 +10057,39 @@ Code parse_static_assert()
 
 	Code
 	assert       = make_code();
-	assert->Type = ECode::Untyped;
+	assert->Type = CT_Untyped;
 
 	Token content = currtok;
 
-	Context.Scope->Name = content;
+	_ctx->parser.Scope->Name = content.Text;
 
-	eat( TokType::StaticAssert );
-	eat( TokType::Capture_Start );
+	eat( Tok_StaticAssert );
+	eat( Tok_Capture_Start );
 	// static_assert(
 
 	// TODO(Ed) : Parse this properly.
 	s32 level = 0;
-	while ( left && ( currtok.Type != TokType::Capture_End || level > 0 ) )
+	while ( left && ( currtok.Type != Tok_Capture_End || level > 0 ) )
 	{
-		if ( currtok.Type == TokType::Capture_Start )
+		if ( currtok.Type == Tok_Capture_Start )
 			level++;
-		else if ( currtok.Type == TokType::Capture_End )
+		else if ( currtok.Type == Tok_Capture_End )
 			level--;
 
 		eat( currtok.Type );
 	}
-	eat( TokType::Capture_End );
-	eat( TokType::Statement_End );
+	eat( Tok_Capture_End );
+	eat( Tok_Statement_End );
 	// static_assert( <Content> );
 
-	content.Length  = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)content.Text;
+	content.Text.Len  = ( (sptr)prevtok.Text.Ptr + prevtok.Text.Len ) - (sptr)content.Text.Ptr;
 
-	char const* str = str_fmt_buf( "%.*s\n", content.Length, content.Text );
-	assert->Content = get_cached_string( { content.Length + 1, str } );
+	char const* str  = c_str_fmt_buf( "%.*s\n", content.Text.Len, content.Text.Ptr );
+	Str content_str = { str, content.Text.Len + 1 };
+	assert->Content = cache_str( content_str );
 	assert->Name	= assert->Content;
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return assert;
 }
 
@@ -10205,22 +10100,22 @@ Code parse_static_assert()
 	passed the basic stripping supported it report a soft failure.
 */
 internal inline
-void parse_template_args( Token& token )
+void parse_template_args( Token* token )
 {
-	if ( currtok.Type == TokType::Operator && currtok.Text[ 0 ] == '<' && currtok.Length == 1 )
+	if ( currtok.Type == Tok_Operator && currtok.Text.Ptr[ 0 ] == '<' && currtok.Text.Len == 1 )
 	{
-		eat( TokType::Operator );
+		eat( Tok_Operator );
 		// <
 
 		s32 level = 0;
-		while ( left && level >= 0 && ( currtok.Text[ 0 ] != '>' || level > 0 ) )
+		while ( left && level >= 0 && ( currtok.Text.Ptr[ 0 ] != '>' || level > 0 ) )
 		{
-			if ( currtok.Text[ 0 ] == '<' )
+			if ( currtok.Text.Ptr[ 0 ] == '<' )
 				level++;
 
-			if ( currtok.Text[ 0 ] == '>' )
+			if ( currtok.Text.Ptr[ 0 ] == '>' )
 				level--;
-			if ( currtok.Type == TokType::Operator && currtok.Text[1] == '>')
+			if ( currtok.Type == Tok_Operator && currtok.Text.Ptr[1] == '>')
 				level--;
 
 			eat( currtok.Type );
@@ -10229,11 +10124,11 @@ void parse_template_args( Token& token )
 
 		// Due to the >> token, this could have been eaten early...
 		if (level == 0)
-			eat( TokType::Operator );
+			eat( Tok_Operator );
 		// < <Content> >
 
 		// Extend length of name to last token
-		token.Length = ( ( sptr )prevtok.Text + prevtok.Length ) - ( sptr )token.Text;
+		token->Text.Len = ( ( sptr )prevtok.Text.Ptr + prevtok.Text.Len ) - ( sptr )token->Text.Ptr;
 	}
 }
 
@@ -10243,52 +10138,51 @@ CodeVar parse_variable_after_name(
 	  ModuleFlag        mflags
 	, CodeAttributes    attributes
 	, CodeSpecifiers    specifiers
-	, CodeType          type
-	, StrC              name
+	, CodeTypename      type
+	, Str               name
 )
 {
 	push_scope();
 
 	Code array_expr    = parse_array_decl();
-	Code expr          = { nullptr };
-	Code bitfield_expr = { nullptr };
+	Code expr          = NullCode;
+	Code bitfield_expr = NullCode;
 
 	b32 using_constructor_initializer = false;
 
-	if ( bitfield_is_equal( u32, currtok.Flags, TF_Assign ) )
-	{
+	if ( bitfield_is_set( u32, currtok.Flags, TF_Assign ) ) {
 		// <Attributes> <Specifiers> <ValueType> <Name> = <Expression>
 		expr = parse_assignment_expression();
 	}
 
-	if ( currtok.Type == TokType::BraceCurly_Open )
+	if ( currtok.Type == Tok_BraceCurly_Open )
 	{
 		Token expr_tok = currtok;
 
-		eat( TokType::BraceCurly_Open );
+		eat( Tok_BraceCurly_Open );
 		// <Attributes> <Specifiers> <ValueType> <Name> {
 
 		s32 level = 0;
-		while ( left && ( currtok.Type != TokType::BraceCurly_Close || level > 0 ) )
+		while ( left && ( currtok.Type != Tok_BraceCurly_Close || level > 0 ) )
 		{
-			if ( currtok.Type == TokType::BraceCurly_Open )
+			if ( currtok.Type == Tok_BraceCurly_Open )
 				level++;
 
-			else if ( currtok.Type == TokType::BraceCurly_Close && level > 0 )
+			else if ( currtok.Type == Tok_BraceCurly_Close && level > 0 )
 				level--;
 
 			eat( currtok.Type );
 		}
-		eat( TokType::BraceCurly_Close );
+		eat( Tok_BraceCurly_Close );
 
-		expr_tok.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)expr_tok.Text;
-		expr            = untyped_str( expr_tok );
+		expr_tok.Text.Len = ( (sptr)prevtok.Text.Ptr + prevtok.Text.Len ) - (sptr)expr_tok.Text.Ptr;
+		expr              = untyped_str( tok_to_str(expr_tok) );
 		// <Attributes> <Specifiers> <ValueType> <Name> = { <Expression> }
 	}
 
-	if ( currtok.Type == TokType::Capture_Start )
+	if ( currtok.Type == Tok_Capture_Start )
 	{
-		eat( TokType:: Capture_Start);
+		eat( Tok_Capture_Start);
 		// <Attributes> <Specifiers> <ValueType> <Name> (
 
 		Token expr_token = currtok;
@@ -10296,54 +10190,51 @@ CodeVar parse_variable_after_name(
 		using_constructor_initializer = true;
 
 		s32 level = 0;
-		while ( left && ( currtok.Type != TokType::Capture_End || level > 0 ) )
+		while ( left && ( currtok.Type != Tok_Capture_End || level > 0 ) )
 		{
-			if ( currtok.Type == TokType::Capture_Start )
+			if ( currtok.Type == Tok_Capture_Start )
 				level++;
 
-			else if ( currtok.Type == TokType::Capture_End && level > 0 )
+			else if ( currtok.Type == Tok_Capture_End && level > 0 )
 				level--;
 
 			eat( currtok.Type );
 		}
 
-		expr_token.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)expr_token.Text;
-		expr              = untyped_str( expr_token );
-		eat( TokType::Capture_End );
+		expr_token.Text.Len = ( (sptr)prevtok.Text.Ptr + prevtok.Text.Len ) - (sptr)expr_token.Text.Ptr;
+		expr                = untyped_str( tok_to_str(expr_token) );
+		eat( Tok_Capture_End );
 		// <Attributes> <Specifiers> <ValueType> <Name> ( <Expression> )
 	}
 
-	if ( currtok.Type == TokType::Assign_Classifer )
+	if ( currtok.Type == Tok_Assign_Classifer )
 	{
-		eat( TokType::Assign_Classifer );
+		eat( Tok_Assign_Classifer );
 		// <Attributes> <Specifiers> <ValueType> <Name> :
 
 		Token expr_tok = currtok;
 
-		if ( currtok.Type == TokType::Statement_End )
-		{
-			log_failure( "Expected expression after bitfield \n%s", Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+		if ( currtok.Type == Tok_Statement_End ) {
+			log_failure( "Expected expression after bitfield \n%SB", parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 
-		while ( left && currtok.Type != TokType::Statement_End )
-		{
+		while ( left && currtok.Type != Tok_Statement_End ) {
 			eat( currtok.Type );
 		}
 
-		expr_tok.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)expr_tok.Text;
-		bitfield_expr   = untyped_str( expr_tok );
+		expr_tok.Text.Len = ( (sptr)prevtok.Text.Ptr + prevtok.Text.Len ) - (sptr)expr_tok.Text.Ptr;
+		bitfield_expr     = untyped_str( tok_to_str(expr_tok) );
 		// <Attributes> <Specifiers> <ValueType> <Name> : <Expression>
 	}
 
-	CodeVar     next_var   = NoCode;
+	CodeVar     next_var   = NullCode;
 	Token       stmt_end   = NullToken;
-	CodeComment inline_cmt = NoCode;
+	CodeComment inline_cmt = NullCode;
 	if ( type )
 	{
-		if ( currtok.Type == TokType::Comma )
-		{
+		if ( currtok.Type == Tok_Comma ) {
 			// Were dealing with a statement with more than one declaration
 			// This is only handled this way if its the first declaration
 			// Otherwise its looped through in parse_variable_declaration_list
@@ -10356,14 +10247,13 @@ CodeVar parse_variable_after_name(
 		// If we're dealing with a "comma-procedding then we cannot expect a statement end or inline comment
 		// Any comma procedding variable will not have a type provided so it can act as a indicator to skip this
 		Token stmt_end = currtok;
-		eat( TokType::Statement_End );
+		eat( Tok_Statement_End );
 		// <Attributes> <Specifiers> <ValueType> <Name> : <Expression>, ...;
 		// <Attributes> <Specifiers> <ValueType> <Name> = <Expression>, ...;
 		// <Attributes> <Specifiers> <ValueType> <Name> { <Expression> }, ...;
 
 		// Check for inline comment : <type> <identifier> = <expression>; // <inline comment>
-		if ( left && ( currtok_noskip.Type == TokType::Comment ) && currtok_noskip.Line == stmt_end.Line )
-		{
+		if ( left && ( currtok_noskip.Type == Tok_Comment ) && currtok_noskip.Line == stmt_end.Line ) {
 			inline_cmt = parse_comment();
 			// <Attributes> <Specifiers> <ValueType> <Name> : <Expression>, ...; <InlineCmt>
 			// <Attributes> <Specifiers> <ValueType> <Name> = <Expression>, ...; <InlineCmt>
@@ -10371,45 +10261,28 @@ CodeVar parse_variable_after_name(
 		}
 	}
 
-	using namespace ECode;
-
 	CodeVar
 	result              = (CodeVar) make_code();
-	result->Type        = Variable;
-	result->Name        = get_cached_string( name );
+	result->Type        = CT_Variable;
+	result->Name        = cache_str( name );
 	result->ModuleFlags = mflags;
+	result->ValueType    = type;
+	result->BitfieldSize = bitfield_expr;
+	result->Attributes   = attributes;
+	result->Specs        = specifiers;
+	result->Value        = expr;
+	result->InlineCmt    = inline_cmt;
 
-	// Type can be null if we're dealing with a declaration from a variable declaration-list
-	if ( type )
-		result->ValueType = type;
-
-	if (array_expr )
+	if (array_expr)
 		type->ArrExpr = array_expr;
 
-	if ( bitfield_expr )
-		result->BitfieldSize = bitfield_expr;
-
-	if ( attributes )
-		result->Attributes = attributes;
-
-	if ( specifiers )
-		result->Specs = specifiers;
-
-	if ( expr )
-		result->Value = expr;
-
-	if ( inline_cmt )
-		result->InlineCmt = inline_cmt;
-
-	if ( next_var )
-	{
+	if ( next_var ) {
 		result->NextVar         = next_var;
-		result->NextVar->Parent = result;
+		result->NextVar->Parent = cast(Code, result);
 	}
+	result->VarParenthesizedInit = using_constructor_initializer;
 
-	result->VarConstructorInit = using_constructor_initializer;
-
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
@@ -10422,155 +10295,155 @@ CodeVar parse_variable_declaration_list()
 {
 	push_scope();
 
-	CodeVar result   = NoCode;
-	CodeVar last_var = NoCode;
-	while ( check( TokType::Comma ) )
+	CodeVar result   = NullCode;
+	CodeVar last_var = NullCode;
+	while ( check( Tok_Comma ) )
 	{
-		eat( TokType::Comma );
+		eat( Tok_Comma );
 		// ,
 
-		CodeSpecifiers specifiers = NoCode;
+		CodeSpecifiers specifiers = NullCode;
 
-		while ( left && currtok.is_specifier() )
+		while ( left && tok_is_specifier(currtok) )
 		{
-			SpecifierT spec = ESpecifier::to_type( currtok );
+			Specifier spec = str_to_specifier( tok_to_str(currtok) );
 
 			switch ( spec )
 			{
-				case ESpecifier::Const:
-					if ( specifiers->NumEntries && specifiers->ArrSpecs[ specifiers->NumEntries - 1 ] != ESpecifier::Ptr )
+				case Spec_Const:
+					if ( specifiers->NumEntries && specifiers->ArrSpecs[ specifiers->NumEntries - 1 ] != Spec_Ptr )
 					{
 						log_failure( "Error, const specifier must come after pointer specifier for variable declaration proceeding comma\n"
-						"(Parser will add and continue to specifiers, but will most likely fail to compile)\n%s"
-						, Context.to_string() );
+						"(Parser will add and continue to specifiers, but will most likely fail to compile)\n%SB"
+						, parser_to_strbuilder(_ctx->parser) );
 
-						specifiers.append( spec );
+						specifiers_append(specifiers, spec );
 					}
 				break;
 
-				case ESpecifier::Ptr:
-				case ESpecifier::Ref:
-				case ESpecifier::RValue:
+				case Spec_Ptr:
+				case Spec_Ref:
+				case Spec_RValue:
 				break;
 
 				default:
 				{
-					log_failure( "Error, invalid specifier '%s' proceeding comma\n"
-					"(Parser will add and continue to specifiers, but will most likely fail to compile)\n%s"
-					, currtok.Text, Context.to_string() );
+					log_failure( "Error, invalid specifier '%S' proceeding comma\n"
+					"(Parser will add and continue to specifiers, but will most likely fail to compile)\n%S"
+					, tok_to_str(currtok), strbuilder_to_str( parser_to_strbuilder(_ctx->parser)) );
 					continue;
 				}
 				break;
 			}
 
-			// eat(currtok.Type);
-
 			if ( specifiers )
-				specifiers.append( spec );
+				specifiers_append(specifiers, spec );
 			else
 				specifiers = def_specifier( spec );
+
+			eat(currtok.Type);
 		}
 		// , <Specifiers>
 
-		StrC name = currtok;
-		eat( TokType::Identifier );
+		Str name = tok_to_str(currtok);
+		eat( Tok_Identifier );
 		// , <Specifiers> <Name>
 
-		CodeVar var = parse_variable_after_name( ModuleFlag::None, NoCode, specifiers, NoCode, name );
+		CodeVar var = parse_variable_after_name( ModuleFlag_None, NullCode, specifiers, NullCode, name );
 		// , <Specifiers> <Name> ...
 
 		if ( ! result )
 		{
-			result.ast   = var.ast;
-			last_var.ast = var.ast;
+			result   = var;
+			last_var = var;
 		}
 		else
 		{
-			last_var->NextVar.ast         = var.ast;
-			last_var->NextVar->Parent.ast = rcast(AST*, var.ast);
-			last_var.ast                  = var.ast;
+			last_var->NextVar         = var;
+			last_var->NextVar->Parent = cast(Code, var);
+			last_var                  = var;
 		}
 	}
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeClass parse_class( bool inplace_def )
+CodeClass parser_parse_class( bool inplace_def )
 {
 	push_scope();
-	CodeClass result = (CodeClass) parse_class_struct( TokType::Decl_Class, inplace_def );
-	Context.pop();
+	CodeClass result = (CodeClass) parse_class_struct( Tok_Decl_Class, inplace_def );
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeConstructor parse_constructor( CodeSpecifiers specifiers )
+CodeConstructor parser_parse_constructor( CodeSpecifiers specifiers )
 {
 	push_scope();
 
-	Token     identifier = parse_identifier();
-	CodeParam params     = parse_params();
+	Token     identifier = parse_identifier(nullptr);
+	CodeParams params     = parse_params(parser_not_from_template);
 	// <Name> ( <Parameters> )
 
-	Code        initializer_list = NoCode;
-	CodeBody    body             = NoCode;
-	CodeComment inline_cmt       = NoCode;
+	Code        initializer_list = NullCode;
+	CodeBody    body             = NullCode;
+	CodeComment inline_cmt       = NullCode;
 
 	// TODO(Ed) : Need to support postfix specifiers
 
-	if ( check( TokType::Assign_Classifer ) )
+	if ( check( Tok_Assign_Classifer ) )
 	{
-		eat( TokType::Assign_Classifer );
+		eat( Tok_Assign_Classifer );
 		// <Name> ( <Parameters> ) :
 
 		Token initializer_list_tok = currtok;
 
 		s32 level                  = 0;
-		while ( left && ( currtok.Type != TokType::BraceCurly_Open || level > 0 ) )
+		while ( left && ( currtok.Type != Tok_BraceCurly_Open || level > 0 ) )
 		{
-			if (currtok.Type == TokType::Capture_Start)
+			if (currtok.Type == Tok_Capture_Start)
 				level++;
-			else if ( currtok.Type == TokType::Capture_End )
+			else if ( currtok.Type == Tok_Capture_End )
 				level--;
 
 			eat( currtok.Type );
 		}
 
-		initializer_list_tok.Length = ( ( sptr )prevtok.Text + prevtok.Length ) - ( sptr )initializer_list_tok.Text;
+		initializer_list_tok.Text.Len = ( ( sptr )prevtok.Text.Ptr + prevtok.Text.Len ) - ( sptr )initializer_list_tok.Text.Ptr;
 		// <Name> ( <Parameters> ) : <InitializerList>
 
-		initializer_list = untyped_str( initializer_list_tok );
+		initializer_list = untyped_str( tok_to_str(initializer_list_tok) );
 
 		// TODO(Ed): Constructors can have post-fix specifiers
 
-		body = parse_function_body();
+		body = cast(CodeBody, parse_function_body());
 		// <Name> ( <Parameters> ) : <InitializerList> { <Body> }
 	}
-	else if ( check( TokType::BraceCurly_Open ) )
+	else if ( check( Tok_BraceCurly_Open ) )
 	{
-		body = parse_function_body();
+		body = cast(CodeBody, parse_function_body());
 		// <Name> ( <Parameters> ) { <Body> }
 	}
-	else if ( check( TokType::Operator) && currtok.Text[ 0 ] == '=' )
+	else if ( check( Tok_Operator) && currtok.Text.Ptr[ 0 ] == '=' )
 	{
-		body = parse_assignment_expression();
+		body = cast(CodeBody, parse_assignment_expression());
 	}
 	else
 	{
 		Token stmt_end = currtok;
-		eat( TokType::Statement_End );
+		eat( Tok_Statement_End );
 		// <Name> ( <Parameters> );
 
-		if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
+		if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
 			inline_cmt = parse_comment();
 		// <Name> ( <Parameters> ); <InlineCmt>
 	}
 
 	CodeConstructor result = ( CodeConstructor )make_code();
 
-	result->Name = get_cached_string(identifier);
+	result->Name = cache_str( tok_to_str(identifier));
 
 	result->Specs = specifiers;
 
@@ -10580,157 +10453,245 @@ CodeConstructor parse_constructor( CodeSpecifiers specifiers )
 	if ( initializer_list )
 		result->InitializerList = initializer_list;
 
-	if ( body && body->Type == ECode::Function_Body )
+	if ( body && body->Type == CT_Function_Body )
 	{
-		result->Body = body;
-		result->Type = ECode::Constructor;
+		result->Body = cast(Code, body);
+		result->Type = CT_Constructor;
 	}
 	else
-		result->Type = ECode::Constructor_Fwd;
+		result->Type = CT_Constructor_Fwd;
 
 	if ( inline_cmt )
 		result->InlineCmt = inline_cmt;
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
+internal inline
+CodeDefine parser_parse_define()
+{
+	push_scope();
+	if ( check(Tok_Preprocess_Hash)) {
+		// If parse_define is called by the user the hash reach here.
+		eat(Tok_Preprocess_Hash);
+	}
+
+	eat( Tok_Preprocess_Define );
+	// #define
+
+	CodeDefine
+	define = (CodeDefine) make_code();
+	define->Type = CT_Preprocess_Define;
+	if ( ! check( Tok_Identifier ) ) {
+		log_failure( "Error, expected identifier after #define\n%s", parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
+	}
+	_ctx->parser.Scope->Name = currtok.Text;
+	define->Name = cache_str( tok_to_str(currtok) );
+	eat( Tok_Identifier );
+	// #define <Name>
+
+	Macro* macro = lookup_macro(define->Name);
+	if (macro_is_functional(* macro)) {
+		eat( Tok_Capture_Start );
+		// #define <Name> (
+
+		// We provide the define params even if empty to make sure '()' are serialized.
+		CodeDefineParams
+		params = (CodeDefineParams) make_code();
+		params->Type = CT_Parameters_Define;
+
+		if ( left && currtok.Type != Tok_Capture_End ) {
+			params->Name = currtok.Text;
+			params->NumEntries ++;
+
+			eat( Tok_Preprocess_Define_Param );
+			// #define <Name> ( <param>
+		}
+		
+		while( left && currtok.Type != Tok_Capture_End ) {
+			eat( Tok_Comma );
+			// #define <Name> ( <param>, 
+
+			CodeDefineParams next_param = (CodeDefineParams) make_code();
+			next_param->Type = CT_Parameters_Define;
+			next_param->Name = currtok.Text;
+			define_params_append(params, next_param);
+
+			// #define  <Name> (  <param>, <next_param> ...
+			eat( Tok_Preprocess_Define_Param );
+		}
+
+		eat( Tok_Capture_End );
+		// #define <Name> ( <params> )
+
+		define->Params = params;
+	}
+
+	if ( ! check( Tok_Preprocess_Content ))
+	{
+		log_failure( "Error, expected content after #define %s\n%s", define->Name, parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
+	}
+
+	if ( currtok.Text.Len == 0 )
+	{
+		define->Body = untyped_str( txt("\n") );
+		eat( Tok_Preprocess_Content );
+		// #define <Name> ( <params> ) <Content>
+
+		parser_pop(& _ctx->parser);
+		return define;
+	}
+
+	define->Body = untyped_str( strbuilder_to_str( parser_strip_formatting( tok_to_str(currtok), parser_strip_formatting_dont_preserve_newlines )) );
+	eat( Tok_Preprocess_Content );
+	// #define <Name> ( <params> ) <Content>
+
+	parser_pop(& _ctx->parser);
+	return define;
+}
+
 internal
-CodeDestructor parse_destructor( CodeSpecifiers specifiers )
+CodeDestructor parser_parse_destructor( CodeSpecifiers specifiers )
 {
 	push_scope();
 
-	bool has_context         = Context.Scope && Context.Scope->Prev;
-	bool is_in_global_nspace = has_context && str_compare( Context.Scope->Prev->ProcName, "parse_global_nspace" ) == 0;
+	bool has_context         = _ctx->parser.Scope && _ctx->parser.Scope->Prev;
+	bool is_in_global_nspace = has_context && str_are_equal( _ctx->parser.Scope->Prev->ProcName, txt("parse_global_nspace") );
 
-	if ( check( TokType::Spec_Virtual ) )
+	if ( check( Tok_Spec_Virtual ) )
 	{
 		if ( specifiers )
-			specifiers.append( ESpecifier::Virtual );
+			specifiers_append(specifiers, Spec_Virtual );
 		else
-			specifiers = def_specifier( ESpecifier::Virtual );
-		eat( TokType::Spec_Virtual );
+			specifiers = def_specifier( Spec_Virtual );
+		eat( Tok_Spec_Virtual );
 	}
 	// <Virtual Specifier>
 
 	Token prefix_identifier = NullToken;
 	if (is_in_global_nspace)
-		prefix_identifier = parse_identifier();
+		prefix_identifier = parse_identifier(nullptr);
 
-	if ( left && currtok.Text[ 0 ] == '~' )
-		eat( TokType::Operator );
+	if ( left && currtok.Text.Ptr[ 0 ] == '~' )
+		eat( Tok_Operator );
 	else
 	{
-		log_failure( "Expected destructor '~' token\n%s", Context.to_string() );
-		return CodeInvalid;
+		log_failure( "Expected destructor '~' token\n%s", parser_to_strbuilder(_ctx->parser) );
+		parser_pop( & _ctx->parser);
+		return InvalidCode;
 	}
 	// <Virtual Specifier> ~
 
-	Token       identifier = parse_identifier();
+	Token       identifier = parse_identifier(nullptr);
 	CodeBody    body       = { nullptr };
-	CodeComment inline_cmt = NoCode;
+	CodeComment inline_cmt = NullCode;
 	// <Virtual Specifier> ~<Name>
 
-	eat( TokType::Capture_Start );
-	eat( TokType::Capture_End );
+	eat( Tok_Capture_Start );
+	eat( Tok_Capture_End );
 	// <Virtual Specifier> ~<Name>()
 
 	bool pure_virtual = false;
 
-	if ( check( TokType::Operator ) && currtok.Text[ 0 ] == '=' )
+	if ( check( Tok_Operator ) && currtok.Text.Ptr[ 0 ] == '=' )
 	{
 		// <Virtual Specifier> ~<Name>() =
 
 		bool skip_formatting = true;
-		Token next = Context.Tokens.next(skip_formatting);
-		if ( left && next.Text[ 0 ] == '0' )
+		Token upcoming = nexttok;
+		if ( left && upcoming.Text.Ptr[ 0 ] == '0' )
 		{
-			eat( TokType::Operator );
-			eat( TokType::Number );
+			eat( Tok_Operator );
+			eat( Tok_Number );
 			// <Virtual Specifier> ~<Name>() = 0
 
-			specifiers.append( ESpecifier::Pure );
+			specifiers_append(specifiers, Spec_Pure );
 		}
-		else if ( left && str_compare( next.Text, "default", sizeof("default") - 1 ) == 0)
+		else if ( left && c_str_compare_len( upcoming.Text.Ptr, "default", sizeof("default") - 1 ) == 0) 
 		{
-			body = parse_assignment_expression();
+			body = cast(CodeBody, parse_assignment_expression());
 			// <Virtual Specifier> ~<
 		}
 		else
 		{
-			log_failure( "Pure or default specifier expected due to '=' token\n%s", Context.to_string() );
-			return CodeInvalid;
+			log_failure( "Pure or default specifier expected due to '=' token\n%s", parser_to_strbuilder(_ctx->parser) );
+			parser_pop( & _ctx->parser);
+			return InvalidCode;
 		}
 
 		pure_virtual = true;
 	}
 
-	if ( ! pure_virtual && check( TokType::BraceCurly_Open ) )
-		body = parse_function_body();
-	// <Virtual Specifier> ~<Name>() { ... }
+	if ( ! pure_virtual && check( Tok_BraceCurly_Open ) )
+	{
+		body = cast(CodeBody, parse_function_body());
+		// <Virtual Specifier> ~<Name>() { ... }
+	}
 	else
 	{
 		Token stmt_end = currtok;
-		eat( TokType::Statement_End );
+		eat( Tok_Statement_End );
 		// <Virtual Specifier> ~<Name>() <Pure Specifier>;
 
-		if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
+		if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
 			inline_cmt = parse_comment();
 		// <Virtual Specifier> ~<Name>() <Pure Specifier>; <InlineCmt>
 	}
 
 	CodeDestructor result = ( CodeDestructor )make_code();
 
-	if ( prefix_identifier )
-	{
-		prefix_identifier.Length += 1 + identifier.Length;
-		result->Name = get_cached_string( prefix_identifier );
+	if ( tok_is_valid(prefix_identifier) ) {
+		prefix_identifier.Text.Len += 1 + identifier.Text.Len;
+		result->Name = cache_str( tok_to_str(prefix_identifier) );
 	}
 
 	if ( specifiers )
 		result->Specs = specifiers;
 
-	if ( body && body->Type == ECode::Function_Body )
-	{
-		result->Body = body;
-		result->Type = ECode::Destructor;
+	if ( body && body->Type == CT_Function_Body ) {
+		result->Body = cast(Code, body);
+		result->Type = CT_Destructor;
 	}
 	else
-		result->Type = ECode::Destructor_Fwd;
+		result->Type = CT_Destructor_Fwd;
 
 	if ( inline_cmt )
 		result->InlineCmt = inline_cmt;
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeEnum parse_enum( bool inplace_def )
+CodeEnum parser_parse_enum( bool inplace_def )
 {
-	using namespace ECode;
 	push_scope();
 
-	SpecifierT specs_found[16] { ESpecifier::NumSpecifiers };
-	s32        NumSpecifiers = 0;
+	Specifier specs_found[16] = { Spec_NumSpecifiers };
+	s32       NumSpecifiers = 0;
 
 	CodeAttributes attributes = { nullptr };
 
-	Token    name       = { nullptr, 0, TokType::Invalid };
-	Code     array_expr = { nullptr };
-	CodeType type       = { nullptr };
+	Token        name       = NullToken;
+	Code         array_expr = { nullptr };
+	CodeTypename type       = { nullptr };
 
-	char  entries_code[ kilobytes(128) ] { 0 };
+	char  entries_code[ kilobytes(128) ] = { 0 };
 	s32   entries_length = 0;
 
 	bool is_enum_class = false;
 
-	eat( TokType::Decl_Enum );
+	eat( Tok_Decl_Enum );
 	// enum
 
-	if ( currtok.Type == TokType::Decl_Class )
+	if ( currtok.Type == Tok_Decl_Class )
 	{
-		eat( TokType::Decl_Class);
+		eat( Tok_Decl_Class);
 		is_enum_class = true;
 		// enum class
 	}
@@ -10738,374 +10699,425 @@ CodeEnum parse_enum( bool inplace_def )
 	attributes = parse_attributes();
 	// enum <class> <Attributes>
 
-	if ( check( TokType::Identifier ) )
+	if ( check( Tok_Identifier ) )
 	{
 		name = currtok;
-		Context.Scope->Name = currtok;
-		eat( TokType::Identifier );
+		_ctx->parser.Scope->Name = currtok.Text;
+		eat( Tok_Identifier );
 	}
 	// enum <class> <Attributes> <Name>
 
-	if ( currtok.Type == TokType::Assign_Classifer )
+	b32  use_macro_underlying = false;
+	Code underlying_macro     = { nullptr };
+	if ( currtok.Type == Tok_Assign_Classifer )
 	{
-		eat( TokType::Assign_Classifer );
+		eat( Tok_Assign_Classifer );
 		// enum <class> <Attributes> <Name> :
 
-		type = parse_type();
-		if ( type == Code::Invalid )
+		type = parser_parse_type(parser_not_from_template, nullptr);
+		if ( cast(Code, type) == Code_Invalid )
 		{
-			log_failure( "Failed to parse enum classifier\n%s", Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "Failed to parse enum classifier\n%s", parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 		// enum <class> <Attributes> <Name> : <UnderlyingType>
 	}
+	else if ( currtok.Type == Tok_Preprocess_Macro_Expr )
+	{
+		// We'll support the enum_underlying macro
+		if ( str_contains( tok_to_str(currtok), enum_underlying_macro.Name) )
+		{
+			use_macro_underlying = true;
+			underlying_macro     = parse_simple_preprocess( Tok_Preprocess_Macro_Expr );
+		}
+	}
 
 	CodeBody body = { nullptr };
 
-	if ( currtok.Type == TokType::BraceCurly_Open )
+	if ( currtok.Type == Tok_BraceCurly_Open )
 	{
 		body       = (CodeBody) make_code();
-		body->Type = ECode::Enum_Body;
+		body->Type = CT_Enum_Body;
 
-		eat( TokType::BraceCurly_Open );
+		eat( Tok_BraceCurly_Open );
 		// enum <class> <Attributes> <Name> : <UnderlyingType> {
 
-		Code member = CodeInvalid;
+		Code member = InvalidCode;
 
 		bool expects_entry = true;
-		while ( left && currtok_noskip.Type != TokType::BraceCurly_Close )
+		while ( left && currtok_noskip.Type != Tok_BraceCurly_Close )
 		{
 			if ( ! expects_entry )
 			{
-				log_failure( "Did not expect an entry after last member of enum body.\n%s", Context.to_string() );
-				Context.pop();
+				log_failure( "Did not expect an entry after last member of enum body.\n%s", parser_to_strbuilder(_ctx->parser) );
+				parser_pop(& _ctx->parser);
 				break;
 			}
 
-			if ( currtok_noskip.Type == TokType::Preprocess_Hash )
-				eat( TokType::Preprocess_Hash );
+			if ( currtok_noskip.Type == Tok_Preprocess_Hash )
+				eat( Tok_Preprocess_Hash );
 
 			switch ( currtok_noskip.Type )
 			{
-				case TokType::NewLine:
-					member = untyped_str( currtok_noskip );
-					eat( TokType::NewLine );
+				case Tok_NewLine:
+					member = untyped_str( tok_to_str(currtok_noskip) );
+					eat( Tok_NewLine );
 				break;
 
-				case TokType::Comment:
-					member = parse_comment();
+				case Tok_Comment:
+					member = cast(Code, parse_comment());
 				break;
 
-				case TokType::Preprocess_Define:
-					member = parse_define();
+				case Tok_Preprocess_Define:
+					member = cast(Code, parser_parse_define());
 					// #define
 				break;
 
-				case TokType::Preprocess_If:
-				case TokType::Preprocess_IfDef:
-				case TokType::Preprocess_IfNotDef:
-				case TokType::Preprocess_ElIf:
-					member = parse_preprocess_cond();
+				case Tok_Preprocess_If:
+				case Tok_Preprocess_IfDef:
+				case Tok_Preprocess_IfNotDef:
+				case Tok_Preprocess_ElIf:
+					member = cast(Code, parse_preprocess_cond());
 					// #<if, ifdef, ifndef, elif> ...
 				break;
 
-				case TokType::Preprocess_Else:
-					member = preprocess_else;
-					eat( TokType::Preprocess_Else );
+				case Tok_Preprocess_Else:
+					member = cast(Code, preprocess_else);
+					eat( Tok_Preprocess_Else );
 				break;
 
-				case TokType::Preprocess_EndIf:
-					member = preprocess_endif;
-					eat( TokType::Preprocess_EndIf );
+				case Tok_Preprocess_EndIf:
+					member = cast(Code, preprocess_endif);
+					eat( Tok_Preprocess_EndIf );
 				break;
 
-				case TokType::Preprocess_Macro:
-					member = parse_simple_preprocess( TokType::Preprocess_Macro );
+				case Tok_Preprocess_Macro_Stmt: {
+					member = cast(Code, parse_simple_preprocess( Tok_Preprocess_Macro_Stmt ));
 					// <Macro>
-				break;
+					break;
+				}
 
-				case TokType::Preprocess_Pragma:
-					member = parse_pragma();
+				case Tok_Preprocess_Pragma:
+					member = cast(Code, parse_pragma());
 					// #pragma
 				break;
 
-				case TokType::Preprocess_Unsupported:
-					member = parse_simple_preprocess( TokType::Preprocess_Unsupported );
+				case Tok_Preprocess_Unsupported:
+					member = cast(Code, parse_simple_preprocess( Tok_Preprocess_Unsupported ));
 					// #<UNSUPPORTED>
 				break;
 
 				default:
+				{
 					Token entry = currtok;
 
-					eat( TokType::Identifier);
+					eat( Tok_Identifier);
 					// <Name>
 
-					if ( currtok.Type == TokType::Operator && currtok.Text[0] == '=' )
+					if ( currtok.Type == Tok_Operator && currtok.Text.Ptr[0] == '=' )
 					{
-						eat( TokType::Operator );
+						eat( Tok_Operator );
 						// <Name> =
 
-						while ( currtok_noskip.Type != TokType::Comma && currtok_noskip.Type != TokType::BraceCurly_Close )
-						{
-							eat( currtok_noskip.Type );
+						while ( currtok.Type != Tok_Comma && currtok.Type != Tok_BraceCurly_Close ) {
+							eat( currtok.Type );
 						}
 					}
 					// <Name> = <Expression>
 
 					// Unreal UMETA macro support
-					if ( currtok.Type == TokType::Preprocess_Macro )
-					{
-						eat( TokType::Preprocess_Macro );
+					if ( currtok.Type == Tok_Preprocess_Macro_Expr ) {
+						Code macro = parse_simple_preprocess( Tok_Preprocess_Macro_Expr );
 						// <Name> = <Expression> <Macro>
+
+						// We're intentially ignoring this code as its going to be serialized as an untyped string with the rest of the enum "entry".
+						// TODO(Ed): We need a CodeEnumEntry, AST_EnumEntry types
 					}
 
-					if ( currtok.Type == TokType::Comma )
+					if ( currtok.Type == Tok_Comma )
 					{
-						eat( TokType::Comma );
+						//Token prev = * previous(_ctx->parser.Tokens, dont_skip_formatting);
+						//entry.Length = ( (sptr)prev.Text + prev.Length ) - (sptr)entry.Text;
+
+						eat( Tok_Comma );
 						// <Name> = <Expression> <Macro>,
 					}
 
 					// Consume inline comments
-					// if ( currtok.Type == TokType::Comment && prevtok.Line == currtok.Line )
+					// if ( currtok.Type == Tok_Comment && prevtok.Line == currtok.Line )
 					// {
-						// eat( TokType::Comment );
+						// eat( Tok_Comment );
 						// <Name> = <Expression> <Macro>, // <Inline Comment>
 					// }
 
-					entry.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)entry.Text;
+					Token prev     = * lex_previous(_ctx->parser.Tokens, lex_dont_skip_formatting);
+					entry.Text.Len = ( (sptr)prev.Text.Ptr + prev.Text.Len ) - (sptr)entry.Text.Ptr;
 
-					member = untyped_str( entry );
+					member = untyped_str( tok_to_str(entry) );
+				}
 				break;
 			}
 
-			if ( member == Code::Invalid )
-			{
-				log_failure( "Failed to parse member\n%s", Context.to_string() );
-				Context.pop();
-				return CodeInvalid;
+			if ( member == Code_Invalid ) {
+				log_failure( "Failed to parse member\n%s", parser_to_strbuilder(_ctx->parser) );
+				parser_pop(& _ctx->parser);
+				return InvalidCode;
 			}
 
-			body.append( member );
+			body_append(body, member );
 		}
 
-		eat( TokType::BraceCurly_Close );
+		eat( Tok_BraceCurly_Close );
 		// enum <class> <Attributes> <Name> : <UnderlyingType> { <Body> }
 	}
 
-	CodeComment inline_cmt = NoCode;
+	CodeComment inline_cmt = NullCode;
 
 	if ( ! inplace_def )
 	{
 		Token stmt_end = currtok;
-		eat( TokType::Statement_End );
+		eat( Tok_Statement_End );
 		// enum <class> <Attributes> <Name> : <UnderlyingType> { <Body> };
 
-		if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
+		if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
 			inline_cmt = parse_comment();
 			// enum <class> <Attributes> <Name> : <UnderlyingType> { <Body> }; <InlineCmt>
 	}
 
-	using namespace ECode;
-
 	CodeEnum
 	result = (CodeEnum) make_code();
 
-	if ( body.ast )
+	if ( body )
 	{
-		result->Type = is_enum_class ? Enum_Class : Enum;
+		result->Type = is_enum_class ? CT_Enum_Class : CT_Enum;
 		result->Body = body;
 	}
 	else
 	{
-		result->Type = is_enum_class ? Enum_Class_Fwd : Enum_Fwd;
+		result->Type = is_enum_class ? CT_Enum_Class_Fwd : CT_Enum_Fwd;
 	}
 
-	result->Name = get_cached_string( name );
+	result->Name = cache_str( tok_to_str(name) );
 
 	if ( attributes )
 		result->Attributes = attributes;
 
-	if ( type )
-		result->UnderlyingType = type;
+	result->UnderlyingTypeMacro = underlying_macro;
+	result->UnderlyingType      = type;
 
 	if ( inline_cmt )
 		result->InlineCmt = inline_cmt;
 
-	Context.pop();
+
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal inline
-CodeBody parse_export_body()
+CodeBody parser_parse_export_body()
 {
 	push_scope();
-	CodeBody result = parse_global_nspace( ECode::Export_Body );
-	Context.pop();
+	CodeBody result = parse_global_nspace( CT_Export_Body );
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal inline
-CodeBody parse_extern_link_body()
+CodeBody parser_parse_extern_link_body()
 {
 	push_scope();
-	CodeBody result = parse_global_nspace( ECode::Extern_Linkage_Body );
-	Context.pop();
+	CodeBody result = parse_global_nspace( CT_Extern_Linkage_Body );
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeExtern parse_extern_link()
+CodeExtern parser_parse_extern_link()
 {
 	push_scope();
 
-	eat( TokType::Decl_Extern_Linkage );
+	eat( Tok_Decl_Extern_Linkage );
 	// extern
 
 	Token name = currtok;
-	eat( TokType::String );
+	eat( Tok_String );
 	// extern "<Name>"
 
-	name.Text   += 1;
-	name.Length -= 1;
+	name.Text.Ptr += 1;
+	name.Text.Len -= 1;
 
 	CodeExtern
 	result       = (CodeExtern) make_code();
-	result->Type = ECode::Extern_Linkage;
-	result->Name = get_cached_string( name );
+	result->Type = CT_Extern_Linkage;
+	result->Name = cache_str( tok_to_str(name) );
 
-	Code entry = parse_extern_link_body();
-	if ( entry == Code::Invalid )
+	CodeBody entry = parser_parse_extern_link_body();
+	if ( cast(Code, entry) == Code_Invalid )
 	{
-		log_failure( "Failed to parse body\n%s", Context.to_string() );
-		Context.pop();
+		log_failure( "Failed to parse body\n%s", parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
 		return result;
 	}
 	// extern "<Name>" { <Body> }
 
 	result->Body = entry;
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeFriend parse_friend()
+CodeFriend parser_parse_friend()
 {
-	using namespace ECode;
 	push_scope();
 
-	eat( TokType::Decl_Friend );
+	eat( Tok_Decl_Friend );
 	// friend
 
-	CodeFn function = { nullptr };
+	CodeFn         function   = { nullptr };
+	CodeOperator   op         = { nullptr };
+	CodeSpecifiers specifiers = { nullptr };
+
+	// Specifiers Parsing
+	{
+		Specifier specs_found[ 16 ] = { Spec_NumSpecifiers };
+		s32       NumSpecifiers = 0;
+
+		while ( left && tok_is_specifier(currtok) )
+		{
+			Specifier spec = str_to_specifier( tok_to_str(currtok) );
+
+			switch ( spec )
+			{
+				GEN_PARSER_FRIEND_ALLOWED_SPECIFIERS_CASES:
+				break;
+
+				default :
+					log_failure( "Invalid specifier %S for friend definition\n%S", spec_to_str( spec ), strbuilder_to_str( parser_to_strbuilder(_ctx->parser)) );
+					parser_pop(& _ctx->parser);
+					return InvalidCode;
+			}
+
+			// Ignore const it will be handled by the type
+			if ( spec == Spec_Const )
+				break;
+
+			specs_found[ NumSpecifiers ] = spec;
+			NumSpecifiers++;
+			eat( currtok.Type );
+		}
+
+		if ( NumSpecifiers ) {
+			specifiers = def_specifiers( NumSpecifiers, specs_found );
+		}
+		// <friend> <specifiers>
+	}
 
 	// Type declaration or return type
-	CodeType type = parse_type();
-	if ( type == Code::Invalid )
-	{
-		Context.pop();
-		return CodeInvalid;
+	CodeTypename type = parser_parse_type(parser_not_from_template, nullptr);
+	if ( cast(Code, type) == Code_Invalid ) {
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 	// friend <Type>
 
 	// Funciton declaration
-	if ( currtok.Type == TokType::Identifier )
+	if ( currtok.Type == Tok_Identifier )
 	{
 		// Name
-		Token name          = parse_identifier();
-		Context.Scope->Name = name;
+		Token name          = parse_identifier(nullptr);
+		_ctx->parser.Scope->Name = name.Text;
 		// friend <ReturnType> <Name>
 
-		function = parse_function_after_name( ModuleFlag::None, NoCode, NoCode, type, name );
+		function = parse_function_after_name( ModuleFlag_None, NullCode, specifiers, type, name );
 
 		// Parameter list
-		// CodeParam params = parse_params();
+		// CodeParams params = parse_params();
 		// friend <ReturnType> <Name> ( <Parameters> )
 
 		// function             = make_code();
 		// function->Type       = Function_Fwd;
-		// function->Name       = get_cached_string( name );
+		// function->Name       = cache_str( name );
 		// function->ReturnType = type;
 
 		// if ( params )
 			// function->Params = params;
 	}
 
-	CodeComment inline_cmt = NoCode;
-	if ( function && function->Type == ECode::Function_Fwd )
+	// Operator declaration or definition
+	if ( currtok.Type == Tok_Decl_Operator ) {
+		op = parse_operator_after_ret_type( ModuleFlag_None, NullCode, specifiers, type );
+	}
+
+	CodeComment inline_cmt = NullCode;
+	if ( function && function->Type == CT_Function_Fwd )
 	{
 		Token stmt_end = currtok;
-		eat( TokType::Statement_End );
+		eat( Tok_Statement_End );
 		// friend <Type>;
 		// friend <ReturnType> <Name> ( <Parameters> );
 
-		if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
+		if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
 			inline_cmt = parse_comment();
 		// friend <Type>; <InlineCmt>
 		// friend <ReturnType> <Name> ( <Parameters> ); <InlineCmt>
 	}
 
 	CodeFriend result = ( CodeFriend )make_code();
-	result->Type      = Friend;
+	result->Type      = CT_Friend;
 
 	if ( function )
-		result->Declaration = function;
+		result->Declaration = cast(Code, function);
+	else if ( op )
+		result->Declaration = cast(Code, op);
 	else
-		result->Declaration = type;
+		result->Declaration = cast(Code, type);
 
 	if ( inline_cmt )
 		result->InlineCmt = inline_cmt;
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeFn parse_function()
+CodeFn parser_parse_function()
 {
 	push_scope();
 
-	SpecifierT specs_found[16] { ESpecifier::NumSpecifiers };
+	Specifier specs_found[16] = { Spec_NumSpecifiers };
 	s32        NumSpecifiers = 0;
 
 	CodeAttributes attributes = { nullptr };
 	CodeSpecifiers specifiers = { nullptr };
-	ModuleFlag     mflags     = ModuleFlag::None;
+	ModuleFlag     mflags     = ModuleFlag_None;
 
-	if ( check(TokType::Module_Export) )
-	{
-		mflags = ModuleFlag::Export;
-		eat( TokType::Module_Export );
+	if ( check(Tok_Module_Export) ) {
+		mflags = ModuleFlag_Export;
+		eat( Tok_Module_Export );
 	}
 	// <export>
 
 	attributes = parse_attributes();
 	// <export> <Attributes>
 
-	while ( left && currtok.is_specifier() )
+	while ( left && tok_is_specifier(currtok) )
 	{
-		SpecifierT spec = ESpecifier::to_type( currtok );
+		Specifier spec = str_to_specifier( tok_to_str(currtok) );
 
 		switch ( spec )
 		{
-			case ESpecifier::Const:
-			case ESpecifier::Consteval:
-			case ESpecifier::Constexpr:
-			case ESpecifier::External_Linkage:
-			case ESpecifier::ForceInline:
-			case ESpecifier::Inline:
-			case ESpecifier::NeverInline:
-			case ESpecifier::Static:
+			GEN_PARSER_FUNCTION_ALLOWED_SPECIFIERS_CASES:
 			break;
 
 			default:
-				log_failure( "Invalid specifier %s for functon\n%s", ESpecifier::to_str(spec), Context.to_string() );
-				Context.pop();
-				return CodeInvalid;
+				log_failure( "Invalid specifier %S for functon\n%SB", spec_to_str(spec), parser_to_strbuilder(_ctx->parser) );
+				parser_pop(& _ctx->parser);
+				return InvalidCode;
 		}
 
-		if ( spec == ESpecifier::Const )
+		if ( spec == Spec_Const )
 			continue;
 
 		specs_found[NumSpecifiers] = spec;
@@ -11113,110 +11125,107 @@ CodeFn parse_function()
 		eat( currtok.Type );
 	}
 
-	if ( NumSpecifiers )
-	{
+	if ( NumSpecifiers ) {
 		specifiers = def_specifiers( NumSpecifiers, specs_found );
 	}
 	// <export> <Attributes> <Specifiers>
 
-	CodeType ret_type = parse_type();
-	if ( ret_type == Code::Invalid )
-	{
-		Context.pop();
-		return CodeInvalid;
+	// Note(Ed): We're enforcing that using this codepath requires non-macro jank.
+	// Code macro_stmt = parse_macro_as_definiton(attributes, specifiers);
+	// if (macro_stmt) {
+	// 	parser_pop(& _ctx->parser);
+	// 	return macro_stmt;
+	// }
+
+	CodeTypename ret_type = parser_parse_type(parser_not_from_template, nullptr);
+	if ( cast(Code, ret_type) == Code_Invalid ) {
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 	// <export> <Attributes> <Specifiers> <ReturnType>
 
-	Token name = parse_identifier();
-	Context.Scope->Name = name;
-	if ( ! name )
-	{
-		Context.pop();
-		return CodeInvalid;
+	Token name = parse_identifier(nullptr);
+	_ctx->parser.Scope->Name = name.Text;
+	if ( ! tok_is_valid(name) ) {
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 	// <export> <Attributes> <Specifiers> <ReturnType> <Name>
 
 	CodeFn result = parse_function_after_name( mflags, attributes, specifiers, ret_type, name );
 	// <export> <Attributes> <Specifiers> <ReturnType> <Name> ...
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeNS parse_namespace()
+CodeNS parser_parse_namespace()
 {
 	push_scope();
 
-	eat( TokType::Decl_Namespace );
+	eat( Tok_Decl_Namespace );
 	// namespace
 
-	Token name = parse_identifier();
-	Context.Scope->Name = name;
+	Token name = parse_identifier(nullptr);
+	_ctx->parser.Scope->Name = name.Text;
 	// namespace <Name>
 
-	CodeBody body = parse_global_nspace( ECode::Namespace_Body );
-	if ( body == Code::Invalid )
-	{
-		Context.pop();
-		return CodeInvalid;
+	CodeBody body = parse_global_nspace( CT_Namespace_Body );
+	if ( cast(Code, body) == Code_Invalid ) {
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 	// namespace <Name> { <Body> }
 
 	CodeNS
 	result       = (CodeNS) make_code();
-	result->Type = ECode::Namespace;
-	result->Name = get_cached_string( name );
+	result->Type = CT_Namespace;
+	result->Name = cache_str( tok_to_str(name) );
 
 	result->Body = body;
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeOperator parse_operator()
+CodeOperator parser_parse_operator()
 {
 	push_scope();
 
 	CodeAttributes attributes = { nullptr };
 	CodeSpecifiers specifiers = { nullptr };
-	ModuleFlag     mflags     = ModuleFlag::None;
+	ModuleFlag     mflags     = ModuleFlag_None;
 
-	SpecifierT specs_found[16] { ESpecifier::NumSpecifiers };
+	Specifier specs_found[16] = { Spec_NumSpecifiers };
 	s32        NumSpecifiers = 0;
 
-	if ( check(TokType::Module_Export) )
-	{
-		mflags = ModuleFlag::Export;
-		eat( TokType::Module_Export );
+	if ( check(Tok_Module_Export) ) {
+		mflags = ModuleFlag_Export;
+		eat( Tok_Module_Export );
 	}
 	// <export>
 
 	attributes = parse_attributes();
 	// <export> <Attributes>
 
-	while ( left && currtok.is_specifier() )
+	while ( left && tok_is_specifier(currtok) )
 	{
-		SpecifierT spec = ESpecifier::to_type( currtok );
+		Specifier spec = str_to_specifier( tok_to_str(currtok) );
 
 		switch ( spec )
 		{
-			case ESpecifier::Const:
-			case ESpecifier::Constexpr:
-			case ESpecifier::ForceInline:
-			case ESpecifier::Inline:
-			case ESpecifier::NeverInline:
-			case ESpecifier::Static:
+			GEN_PARSER_OPERATOR_ALLOWED_SPECIFIERS_CASES:
 			break;
 
 			default:
-				log_failure( "Invalid specifier " "%s" " for operator\n%s", ESpecifier::to_str(spec), Context.to_string() );
-				Context.pop();
-				return CodeInvalid;
+				log_failure( "Invalid specifier " "%S" " for operator\n%SB", spec_to_str(spec), parser_to_strbuilder(_ctx->parser) );
+				parser_pop(& _ctx->parser);
+				return InvalidCode;
 		}
 
-		if ( spec == ESpecifier::Const )
+		if ( spec == Spec_Const )
 			continue;
 
 		specs_found[NumSpecifiers] = spec;
@@ -11224,168 +11233,165 @@ CodeOperator parse_operator()
 		eat( currtok.Type );
 	}
 
-	if ( NumSpecifiers )
-	{
+	if ( NumSpecifiers ) {
 		specifiers = def_specifiers( NumSpecifiers, specs_found );
 	}
 	// <export> <Attributes> <Specifiers>
 
 	// Parse Return Type
-	CodeType ret_type = parse_type();
+	CodeTypename ret_type = parser_parse_type(parser_not_from_template, nullptr);
 	// <export> <Attributes> <Specifiers> <ReturnType>
 
 	CodeOperator result = parse_operator_after_ret_type( mflags, attributes, specifiers, ret_type );
 	// <export> <Attributes> <Specifiers> <ReturnType> ...
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeOpCast parse_operator_cast( CodeSpecifiers specifiers )
+CodeOpCast parser_parse_operator_cast( CodeSpecifiers specifiers )
 {
 	push_scope();
 
 	// Operator's namespace if not within same class.
 	Token name = NullToken;
-	if ( check( TokType::Identifier ) )
+	if ( check( Tok_Identifier ) )
 	{
 		name = currtok;
-		while ( left && currtok.Type == TokType::Identifier )
+		while ( left && currtok.Type == Tok_Identifier )
 		{
-			eat( TokType::Identifier );
+			eat( Tok_Identifier );
 			// <Specifiers> <Qualifier>
 
-			if ( currtok.Type == TokType::Access_StaticSymbol )
-				eat( TokType::Access_StaticSymbol );
+			if ( currtok.Type == Tok_Access_StaticSymbol )
+				eat( Tok_Access_StaticSymbol );
 				// <Specifiers> <Qualifier> ::
 		}
 		// <Specifiers> <Qualifier> :: ...
 
-		name.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)name.Text;
+		name.Text.Len = ( (sptr)prevtok.Text.Ptr + prevtok.Text.Len ) - (sptr)name.Text.Ptr;
 	}
 
-	eat( TokType::Decl_Operator );
+	eat( Tok_Decl_Operator );
 	// <Specifiers> <Qualifier> :: ... operator
 
-	Code type = parse_type();
+	CodeTypename type = parser_parse_type(parser_not_from_template, nullptr);
 	// <Specifiers> <Qualifier> :: ... operator <UnderlyingType>
 
-	Context.Scope->Name = { type->Name.Data, type->Name.length() };
+	Str scope_name         = { type->Name.Ptr, type->Name.Len };
+	Token scope_name_tok   = { scope_name, Tok_Identifier, 0, 0, TF_Null };
+	_ctx->parser.Scope->Name = scope_name_tok.Text;
 
-	eat( TokType::Capture_Start );
-	eat( TokType::Capture_End );
+	eat( Tok_Capture_Start );
+	eat( Tok_Capture_End );
 	// <Specifiers> <Qualifier> :: ... operator <UnderlyingType>()
 
 	// TODO(Ed) : operator cast can have const, volatile, l-value, r-value noexecept qualifying specifiers.
-	if ( check(TokType::Spec_Const))
+	if ( check(Tok_Spec_Const))
 	{
-		if ( specifiers.ast == nullptr )
-			specifiers = def_specifier( ESpecifier::Const );
+		if ( specifiers == nullptr )
+			specifiers = def_specifier( Spec_Const );
 
 		else
-			specifiers.append( ESpecifier::Const );
+			specifiers_append(specifiers, Spec_Const );
 
-		eat( TokType::Spec_Const );
+		eat( Tok_Spec_Const );
 	}
 	// <Specifiers> <Qualifier> :: ... operator <UnderlyingType>() <const>
 
-	Code        body       = NoCode;
-	CodeComment inline_cmt = NoCode;
+	Code        body       = NullCode;
+	CodeComment inline_cmt = NullCode;
 
-	if ( check( TokType::BraceCurly_Open) )
+	if ( check( Tok_BraceCurly_Open) )
 	{
-		eat( TokType::BraceCurly_Open );
+		eat( Tok_BraceCurly_Open );
 		// <Specifiers> <Qualifier> :: ... operator <UnderlyingType>() <const> {
 
 		Token body_str = currtok;
 
 		s32 level = 0;
-		while ( left && ( currtok.Type != TokType::BraceCurly_Close || level > 0 ) )
+		while ( left && ( currtok.Type != Tok_BraceCurly_Close || level > 0 ) )
 		{
-			if ( currtok.Type == TokType::BraceCurly_Open )
+			if ( currtok.Type == Tok_BraceCurly_Open )
 				level++;
 
-			else if ( currtok.Type == TokType::BraceCurly_Close )
+			else if ( currtok.Type == Tok_BraceCurly_Close )
 				level--;
 
 			eat( currtok.Type );
 		}
-		body_str.Length = ( (sptr)prevtok.Text + prevtok.Length ) - (sptr)body_str.Text;
+		body_str.Text.Len = ( (sptr)prevtok.Text.Ptr + prevtok.Text.Len ) - (sptr)body_str.Text.Ptr;
 
-		eat( TokType::BraceCurly_Close );
+		eat( Tok_BraceCurly_Close );
 		// <Specifiers> <Qualifier> :: ... operator <UnderlyingType>() <const> { <Body> }
 
-		body = untyped_str( body_str );
+		body = untyped_str( tok_to_str(body_str) );
 	}
 	else
 	{
 		Token stmt_end = currtok;
-		eat( TokType::Statement_End );
+		eat( Tok_Statement_End );
 		// <Specifiers> <Qualifier> :: ... operator <UnderlyingType>() <const>;
 
-		if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
+		if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
 			inline_cmt = parse_comment();
 			// <Specifiers> <Qualifier> :: ... operator <UnderlyingType>() <const>; <InlineCmt>
 	}
 
 	CodeOpCast result = (CodeOpCast) make_code();
 
-	if ( name )
-		result->Name = get_cached_string( name );
+	if ( tok_is_valid(name) )
+		result->Name = cache_str( tok_to_str(name) );
 
-	if (body)
-	{
-		result->Type = ECode::Operator_Cast;
-		result->Body = body;
+	if (body) {
+		result->Type = CT_Operator_Cast;
+		result->Body = cast(CodeBody, body);
 	}
-	else
-	{
-		result->Type = ECode::Operator_Cast_Fwd;
+	else {
+		result->Type = CT_Operator_Cast_Fwd;
 	}
 
 	if ( specifiers )
 		result->Specs = specifiers;
 
-	result->ValueType = type;
+	result->ValueType = cast(CodeTypename, type);
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal inline
-CodeStruct parse_struct( bool inplace_def )
+CodeStruct parser_parse_struct( bool inplace_def )
 {
 	push_scope();
-	CodeStruct result = (CodeStruct) parse_class_struct( TokType::Decl_Struct, inplace_def );
-	Context.pop();
+	CodeStruct result = (CodeStruct) parse_class_struct( Tok_Decl_Struct, inplace_def );
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeTemplate parse_template()
+CodeTemplate parser_parse_template()
 {
 #define UseTemplateCapture true
 
 	push_scope();
 
-	ModuleFlag mflags = ModuleFlag::None;
+	ModuleFlag mflags = ModuleFlag_None;
 
-	if ( check( TokType::Module_Export ) )
-	{
-		mflags = ModuleFlag::Export;
-		eat( TokType::Module_Export );
+	if ( check( Tok_Module_Export ) ) {
+		mflags = ModuleFlag_Export;
+		eat( Tok_Module_Export );
 	}
 	// <export> template
 
-	eat( TokType::Decl_Template );
+	eat( Tok_Decl_Template );
 	// <export> template
 
-	Code params = parse_params( UseTemplateCapture );
-	if ( params == Code::Invalid )
-	{
-		Context.pop();
-		return CodeInvalid;
+	CodeParams params = parse_params( UseTemplateCapture );
+	if ( cast(Code, params) == Code_Invalid ) {
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 	// <export> template< <Parameters> >
 
@@ -11393,43 +11399,43 @@ CodeTemplate parse_template()
 
 	while ( left )
 	{
-		if ( check( TokType::Decl_Class ) )
+		if ( check( Tok_Decl_Class ) )
 		{
-			definition = parse_class();
+			definition = cast(Code, parser_parse_class( parser_not_inplace_def));
 			// <export> template< <Parameters> > class ...
 			break;
 		}
 
-		if ( check( TokType::Decl_Struct ) )
+		if ( check( Tok_Decl_Struct ) )
 		{
-			definition = parse_struct();
+			definition = cast(Code, parser_parse_struct( parser_not_inplace_def));
 			// <export> template< <Parameters> > struct ...
 			break;
 		}
 
-		if ( check( TokType::Decl_Union ) )
+		if ( check( Tok_Decl_Union ) )
 		{
-			definition = parse_union();
+			definition = cast(Code, parser_parse_union( parser_not_inplace_def));
 			// <export> template< <Parameters> > union ...
 			break;
 		}
 
-		if ( check( TokType::Decl_Using ) )
+		if ( check( Tok_Decl_Using ) )
 		{
-			definition = parse_using();
+			definition = cast(Code, parser_parse_using());
 			// <export> template< <Parameters> > using ...
 			break;
 		}
 
 		// Its either a function or a variable
-		Token name                = { nullptr, 0, TokType::Invalid };
+		Token name                = NullToken;
 
 		CodeAttributes attributes = { nullptr };
 		CodeSpecifiers specifiers = { nullptr };
 
 		bool expects_function     = false;
 
-		SpecifierT specs_found[ 16 ] { ESpecifier::NumSpecifiers };
+		Specifier specs_found[ 16 ] = { Spec_NumSpecifiers };
 		s32        NumSpecifiers = 0;
 
 		attributes = parse_attributes();
@@ -11437,38 +11443,27 @@ CodeTemplate parse_template()
 
 		// Specifiers Parsing
 		{
-			while ( left && currtok.is_specifier() )
+			while ( left && tok_is_specifier(currtok) )
 			{
-				SpecifierT spec = ESpecifier::to_type( currtok );
+				Specifier spec = str_to_specifier( tok_to_str(currtok) );
 
 				switch ( spec )
 				{
-					case ESpecifier::Const :
-					case ESpecifier::Constexpr :
-					case ESpecifier::Constinit :
-					case ESpecifier::External_Linkage :
-					case ESpecifier::Global :
-					case ESpecifier::Inline :
-					case ESpecifier::ForceInline :
-					case ESpecifier::Local_Persist :
-					case ESpecifier::Mutable :
-					case ESpecifier::Static :
-					case ESpecifier::Thread_Local :
-					case ESpecifier::Volatile :
-						break;
+					GEN_PARSER_TEMPLATE_ALLOWED_SPECIFIERS_CASES:
+					break;
 
-					case ESpecifier::Consteval :
+					case Spec_Consteval :
 						expects_function = true;
 						break;
 
 					default :
-						log_failure( "Invalid specifier %s for variable or function\n%s", ESpecifier::to_str( spec ), Context.to_string() );
-						Context.pop();
-						return CodeInvalid;
+						log_failure( "Invalid specifier %S for variable or function\n%SB", spec_to_str( spec ), parser_to_strbuilder(_ctx->parser) );
+						parser_pop(& _ctx->parser);
+						return InvalidCode;
 				}
 
 				// Ignore const it will be handled by the type
-				if ( spec == ESpecifier::Const )
+				if ( spec == Spec_Const )
 					break;
 
 				specs_found[ NumSpecifiers ] = spec;
@@ -11476,22 +11471,20 @@ CodeTemplate parse_template()
 				eat( currtok.Type );
 			}
 
-			if ( NumSpecifiers )
-			{
+			if ( NumSpecifiers ) {
 				specifiers = def_specifiers( NumSpecifiers, specs_found );
 			}
 			// <export> template< <Parameters> > <Attributes> <Specifiers>
 		}
 
 
-		bool has_context         = Context.Scope && Context.Scope->Prev;
-		bool is_in_global_nspace = has_context && str_compare( Context.Scope->Prev->ProcName, "parse_global_nspace" ) == 0;
-
+		bool has_context         = _ctx->parser.Scope && _ctx->parser.Scope->Prev;
+		bool is_in_global_nspace = has_context && str_are_equal( _ctx->parser.Scope->Prev->ProcName, txt("parse_global_nspace") );
 		// Possible constructor implemented at global file scope.
 		if (is_in_global_nspace)
 		{
 			Code constructor_destructor = parse_global_nspace_constructor_destructor( specifiers );
-			if ( constructor_destructor )
+			if ( constructor_destructor ) 
 			{
 				definition = constructor_destructor;
 				// <Attributes> <Specifiers> <Name> :: <Name> <Type> () { ... }
@@ -11503,31 +11496,30 @@ CodeTemplate parse_template()
 		if (is_in_global_nspace)
 		{
 			bool found_operator_cast_outside_class_implmentation = false;
-			s32  idx = Context.Tokens.Idx;
+			s32  idx = _ctx->parser.Tokens.Idx;
 
-			for ( ; idx < Context.Tokens.Arr.num(); idx++ )
+			for ( ; idx < array_num(_ctx->parser.Tokens.Arr); idx++ )
 			{
-				Token tok = Context.Tokens[ idx ];
+				Token tok = _ctx->parser.Tokens.Arr[ idx ];
 
-				if ( tok.Type == TokType::Identifier )
+				if ( tok.Type == Tok_Identifier )
 				{
 					idx++;
-					tok = Context.Tokens[ idx ];
-					if ( tok.Type == TokType::Access_StaticSymbol )
+					tok = _ctx->parser.Tokens.Arr[ idx ];
+					if ( tok.Type == Tok_Access_StaticSymbol )
 						continue;
 
 					break;
 				}
 
-				if ( tok.Type == TokType::Decl_Operator )
+				if ( tok.Type == Tok_Decl_Operator )
 					found_operator_cast_outside_class_implmentation = true;
 
 				break;
 			}
 
-			if ( found_operator_cast_outside_class_implmentation )
-			{
-				definition = parse_operator_cast( specifiers );
+			if ( found_operator_cast_outside_class_implmentation ) {
+				definition = cast(Code, parser_parse_operator_cast( specifiers ));
 				// <Attributes> <Specifiers> <Name> :: operator <Type> () { ... }
 				break;
 			}
@@ -11539,12 +11531,13 @@ CodeTemplate parse_template()
 	}
 
 	CodeTemplate result = ( CodeTemplate )make_code();
-	result->Type        = ECode::Template;
+	result->Type        = CT_Template;
 	result->Params      = params;
 	result->Declaration = definition;
 	result->ModuleFlags = mflags;
+	// result->Name        = definition->Name;
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 #undef UseTemplateCapture
 }
@@ -11562,31 +11555,32 @@ CodeTemplate parse_template()
 	The excess whitespace cannot be stripped however, because there is no semantic awareness within the first capture group.
 */
 internal
-CodeType parse_type( bool from_template, bool* typedef_is_function )
+CodeTypename parser_parse_type( bool from_template, bool* typedef_is_function )
 {
 	push_scope();
 
 	Token context_tok = prevtok;
 
-	SpecifierT specs_found[ 16 ] { ESpecifier::NumSpecifiers };
-	s32        NumSpecifiers = 0;
+	Specifier specs_found[ 16 ] = { Spec_NumSpecifiers };
+	s32       NumSpecifiers = 0;
 
-	Token name               = { nullptr, 0, TokType::Invalid };
+	Token name= NullToken;
+
+	ETypenameTag tag = Tag_None;
 
 	// Attributes are assumed to be before the type signature
 	CodeAttributes attributes = parse_attributes();
 	// <Attributes>
 
 	// Prefix specifiers
-	while ( left && currtok.is_specifier() )
+	while ( left && tok_is_specifier(currtok) )
 	{
-		SpecifierT spec = ESpecifier::to_type( currtok );
+		Specifier spec = str_to_specifier( tok_to_str(currtok) );
 
-		if ( spec != ESpecifier::Const )
-		{
-			log_failure( "Error, invalid specifier used in type definition: %s\n%s", currtok.Text, Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+		if ( spec != Spec_Const ) {
+			log_failure( "Error, invalid specifier used in type definition: %S\n%SB", tok_to_str(currtok), parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 
 		specs_found[ NumSpecifiers ] = spec;
@@ -11595,124 +11589,137 @@ CodeType parse_type( bool from_template, bool* typedef_is_function )
 	}
 	// <Attributes> <Specifiers>
 
-	if ( left == 0 )
-	{
-		log_failure( "Error, unexpected end of type definition\n%s", Context.to_string() );
-		Context.pop();
-		return CodeInvalid;
+	if ( left == 0 ) {
+		log_failure( "Error, unexpected end of type definition\n%SB", parser_to_strbuilder(_ctx->parser) );
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 
-	if ( from_template && currtok.Type == TokType::Decl_Class )
+	if ( from_template && currtok.Type == Tok_Decl_Class )
 	{
 		// If a value's type is being parsed from a template, class can be used instead of typename.
 		name = currtok;
-		eat(TokType::Decl_Class);
+		eat(Tok_Decl_Class);
 		// <class>
 	}
 
 	// All kinds of nonsense can makeup a type signature, first we check for a in-place definition of a class, enum, struct, or union
-	else if ( currtok.Type == TokType::Decl_Class || currtok.Type == TokType::Decl_Enum || currtok.Type == TokType::Decl_Struct
-			|| currtok.Type == TokType::Decl_Union )
+	else if ( currtok.Type == Tok_Decl_Class || currtok.Type == Tok_Decl_Enum || currtok.Type == Tok_Decl_Struct
+			|| currtok.Type == Tok_Decl_Union )
 	{
+		switch (currtok.Type) {
+			case Tok_Decl_Class  : tag = Tag_Class;  break;
+			case Tok_Decl_Enum   : tag = Tag_Enum;   break;
+			case Tok_Decl_Struct : tag = Tag_Struct; break;
+			case Tok_Decl_Union  : tag = Tag_Union;  break;
+			default:
+				break;
+		}
 		eat( currtok.Type );
 		// <Attributes> <Specifiers> <class, enum, struct, union>
 
-		name = parse_identifier();
+		name = parse_identifier(nullptr);
 
 		// name.Length = ( ( sptr )currtok.Text + currtok.Length ) - ( sptr )name.Text;
-		// eat( TokType::Identifier );
-		Context.Scope->Name = name;
+		// eat( Tok_Identifier );
+		_ctx->parser.Scope->Name = name.Text;
 		// <Attributes> <Specifiers> <class, enum, struct, union> <Name>
 	}
 
 // Decltype draft implementaiton
 #if 0
-else if ( currtok.Type == TokType::DeclType )
+else if ( currtok.Type == Tok_DeclType )
 {
 	// Will have a capture and its own parsing rules, were going to just shove everything in a string (for now).
 	name = currtok;
-	eat( TokType::DeclType );
+	eat( Tok_DeclType );
 	// <Attributes> <Specifiers> decltype
 
-	eat( TokType::Capture_Start );
-	while ( left && currtok.Type != TokType::Capture_End )
+	eat( Tok_Capture_Start );
+	while ( left && currtok.Type != Tok_Capture_End )
 	{
-		if ( currtok.Type == TokType::Capture_Start )
+		if ( currtok.Type == Tok_Capture_Start )
 			level++;
 
-		if ( currtok.Type == TokType::Capture_End )
+		if ( currtok.Type == Tok_Capture_End )
 			level--;
 
 		eat( currtok.Type );
 	}
-	eat( TokType::Capture_End );
+	eat( Tok_Capture_End );
 
 	name.Length = ( (sptr)currtok.Text + currtok.Length ) - (sptr)name.Text;
-	Context.Scope->Name = name;
+	_ctx->parser.Scope->Name = name;
 	// <Attributes> <Specifiers> decltype( <Expression > )
 }
 #endif
 
 	// Check if native type keywords are used, eat them for the signature.
 	// <attributes> <specifiers> <native types ...> ...
-	else if ( currtok.Type >= TokType::Type_Unsigned && currtok.Type <= TokType::Type_MS_W64 )
+	else if ( currtok.Type >= Tok_Type_Unsigned && currtok.Type <= Tok_Type_MS_W64 )
 	{
 		// TODO(Ed) : Review this... Its necessary for parsing however the algo's path to this is lost...
 		name = currtok;
 		eat( currtok.Type );
 
-		while ( left && currtok.Type >= TokType::Type_Unsigned && currtok.Type <= TokType::Type_MS_W64 )
+		while ( left && currtok.Type >= Tok_Type_Unsigned && currtok.Type <= Tok_Type_MS_W64 )
 		{
 			eat( currtok.Type );
 		}
 
-		name.Length = ( ( sptr )prevtok.Text + prevtok.Length ) - ( sptr )name.Text;
+		name.Text.Len = ( ( sptr )prevtok.Text.Ptr + prevtok.Text.Len ) - ( sptr )name.Text.Ptr;
 		// <Attributes> <Specifiers> <Compound type expression>
 	}
-	else if ( currtok.Type == TokType::Type_Typename )
+	else if ( currtok.Type == Tok_Type_Typename )
 	{
 		name = currtok;
-		eat(TokType::Type_Typename);
+		eat(Tok_Type_Typename);
 		// <typename>
 
 		if ( ! from_template )
 		{
-			name                = parse_identifier();
-			Context.Scope->Name = name;
-			if ( ! name )
+			name                = parse_identifier(nullptr);
+			_ctx->parser.Scope->Name = name.Text;
+			if ( ! tok_is_valid(name) )
 			{
-				log_failure( "Error, failed to type signature\n%s", Context.to_string() );
-				Context.pop();
-				return CodeInvalid;
+				log_failure( "Error, failed to type signature\n%s", parser_to_strbuilder(_ctx->parser) );
+				parser_pop(& _ctx->parser);
+				return InvalidCode;
 			}
 		}
 	}
+	// TODO(Ed): This needs updating
+	else if ( currtok.Type == Tok_Preprocess_Macro_Typename ) {
+		// Typename is a macro
+		name = currtok;
+		eat(Tok_Preprocess_Macro_Typename);
+	}
 
 	// The usual Identifier type signature that may have namespace qualifiers
 	else
 	{
-		name                = parse_identifier();
-		Context.Scope->Name = name;
-		if ( ! name )
+		name = parse_identifier(nullptr);
+		_ctx->parser.Scope->Name = name.Text;
+		if ( ! tok_is_valid(name) )
 		{
-			log_failure( "Error, failed to type signature\n%s", Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "Error, failed to type signature\n%s", parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 		// <Attributes> <Specifiers> <Qualifier ::> <Identifier>
 		// <Attributes> <Specifiers> <Identifier>
 	}
 
 	// Suffix specifiers for typename.
-	while ( left && currtok.is_specifier() )
+	while ( left && tok_is_specifier(currtok) )
 	{
-		SpecifierT spec = ESpecifier::to_type( currtok );
+		Specifier spec = str_to_specifier( tok_to_str(currtok) );
 
-		if ( spec != ESpecifier::Const && spec != ESpecifier::Ptr && spec != ESpecifier::Ref && spec != ESpecifier::RValue )
+		if ( spec != Spec_Const && spec != Spec_Ptr && spec != Spec_Ref && spec != Spec_RValue )
 		{
-			log_failure( "Error, invalid specifier used in type definition: %s\n%s", currtok.Text, Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "Error, invalid specifier used in type definition: %S\n%SB", tok_to_str(currtok), parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 
 		specs_found[ NumSpecifiers ] = spec;
@@ -11730,42 +11737,42 @@ else if ( currtok.Type == TokType::DeclType )
 	// <Attributes> <Specifiers> <Identifier> <Specifiers>
 
 	// For function type signatures
-	CodeType  return_type = NoCode;
-	CodeParam params      = NoCode;
+	CodeTypename return_type = NullCode;
+	CodeParams    params      = NullCode;
 
 #ifdef GEN_USE_NEW_TYPENAME_PARSING
-	CodeParam params_nested = NoCode;
+	CodeParams params_nested = NullCode;
 #endif
 
 	bool   is_function_typename = false;
 	Token* last_capture         = nullptr;
 	{
-		Token* scanner = Context.Tokens.Arr + Context.Tokens.Idx;
+		Token* scanner = _ctx->parser.Tokens.Arr + _ctx->parser.Tokens.Idx;
 
 		// An identifier being within a typename's signature only occurs if were parsing a typename for a typedef.
-		if ( typedef_is_function && scanner->Type == TokType::Identifier )
+		if ( typedef_is_function && scanner->Type == Tok_Identifier )
 		{
 			is_function_typename = true;
 			++scanner;
 		}
-		is_function_typename = scanner->Type == TokType::Capture_Start;
+		is_function_typename = scanner->Type == Tok_Capture_Start;
 
 		Token* first_capture = scanner;
 		if ( is_function_typename )
 		{
 			// Go to the end of the signature
-			while ( scanner->Type != TokType::Statement_End && scanner->Type != TokType::BraceCurly_Open )
+			while ( scanner->Type != Tok_Statement_End && scanner->Type != Tok_BraceCurly_Open )
 				++scanner;
 
 			// Go back to the first capture start found
-			while ( scanner->Type != TokType::Capture_Start )
+			while ( scanner->Type != Tok_Capture_Start )
 				--scanner;
 
 			last_capture = scanner;
 		}
 
-		bool has_context   = Context.Scope && Context.Scope->Prev;
-		bool is_for_opcast = has_context && str_compare( Context.Scope->Prev->ProcName, "parse_operator_cast" ) == 0;
+		bool has_context   = _ctx->parser.Scope && _ctx->parser.Scope->Prev;
+		bool is_for_opcast = has_context && str_are_equal( _ctx->parser.Scope->Prev->ProcName, txt("parser_parse_operator_cast") );
 		if ( is_for_opcast && is_function_typename && last_capture )
 		{
 			// If we're parsing for an operator cast, having one capture start is not enough
@@ -11786,13 +11793,13 @@ else if ( currtok.Type == TokType::DeclType )
 		// By this point, decltype should have been taken care of for return type, along with any all its specifiers
 
 		// The previous information with exception to attributes will be considered the return type.
-		return_type       = ( CodeType )make_code();
-		return_type->Type = ECode::Typename;
+		return_type       = ( CodeTypename )make_code();
+		return_type->Type = CT_Typename;
 
-		// String
-		// name_stripped = String::make( GlobalAllocator, name );
+		// StrBuilder
+		// name_stripped = StrBuilder::make( FallbackAllocator, name );
 		// name_stripped.strip_space();
-		return_type->Name = get_cached_string( name );
+		return_type->Name = cache_str( tok_to_str(name) );
 
 #ifdef GEN_USE_NEW_TYPENAME_PARSING
 		if ( specifiers )
@@ -11803,26 +11810,25 @@ else if ( currtok.Type == TokType::DeclType )
 
 #else
 		if ( NumSpecifiers )
-			return_type->Specs = def_specifiers( NumSpecifiers, ( SpecifierT* )specs_found );
+			return_type->Specs = def_specifiers( NumSpecifiers, ( Specifier* )specs_found );
 
 		// Reset specifiers, the function itself will have its own suffix specifiers possibly.
 		NumSpecifiers = 0;
 #endif
 		// <Attributes> <ReturnType>
-
-		name = { nullptr, 0, TokType::Invalid };
+		name = NullToken;
 
 		// The next token can either be a capture for the identifier or it could be the identifier exposed.
-		if ( ! check( TokType::Capture_Start ) )
+		if ( ! check( Tok_Capture_Start ) )
 		{
 			// Started with an identifier immeidately, which means its of the format: <ReturnType> <identifier> <capture>;
-			name = parse_identifier();
+			name = parse_identifier(nullptr);
 		}
 		// <Attributes> <ReturnType> <Identifier>
 
 		// If the next token is a capture start and is not the last capture, then we're dealing with function typename whoose identifier is within the
 		// capture.
-		else if ( ( Context.Tokens.Arr + Context.Tokens.Idx ) != last_capture )
+		else if ( ( _ctx->parser.Tokens.Arr + _ctx->parser.Tokens.Idx ) != last_capture )
 		{
 			// WIP : Possible alternative without much pain...
 			// If this were to be parsed properly...
@@ -11833,19 +11839,19 @@ else if ( currtok.Type == TokType::DeclType )
 			// Parse immeidate capture which would be with parse_params()
 			// Eat Capture End
 #ifdef GEN_USE_NEW_TYPENAME_PARSING
-			eat( TokType::Capture_Start );
+			eat( Tok_Capture_Start );
 			// <Attributes> <ReturnType> (
 
 			// Binding specifiers
 			while ( left && currtok.is_specifier() )
 			{
-				SpecifierT spec = ESpecifier::to_type( currtok );
+				Specifier spec = to_type( currtok );
 
-				if ( spec != ESpecifier::Ptr && spec != ESpecifier::Ref && spec != ESpecifier::RValue )
+				if ( spec != Spec_Ptr && spec != Spec_Ref && spec != Spec_RValue )
 				{
-					log_failure( "Error, invalid specifier used in type definition: %s\n%s", currtok.Text, Context.to_string() );
-					Context.pop();
-					return CodeInvalid;
+					log_failure( "Error, invalid specifier used in type definition: %S\n%SB", toktype_to_str(currtok), to_strbuilder(_ctx->parser) );
+					pop(& _ctx->parser);
+					return InvalidCode;
 				}
 
 				specs_found[ NumSpecifiers ] = spec;
@@ -11860,17 +11866,17 @@ else if ( currtok.Type == TokType::DeclType )
 			NumSpecifiers = 0;
 			// <Attributes> <ReturnType> ( <Specifiers>
 
-			if ( check( TokType::Identifier ) )
+			if ( check( Tok_Identifier ) )
 				name = parse_identifier();
 			// <Attributes> <ReturnType> ( <Specifiers> <Identifier>
 
 			// Immeidate parameters
 
-			if ( check( TokType::Capture_Start ) )
+			if ( check( Tok_Capture_Start ) )
 				params_nested = parse_params();
 			// <Attributes> <ReturnType> ( <Specifiers> <Identifier> ( <Parameters> )
 
-			eat( TokType::Capture_End );
+			eat( Tok_Capture_End );
 			// <Attributes> <ReturnType> ( <Specifiers> <Identifier> ( <Parameters> ) )
 
 #else
@@ -11878,44 +11884,44 @@ else if ( currtok.Type == TokType::DeclType )
 			// Everything within this capture will just be shoved into the name field including the capture tokens themselves.
 			name = currtok;
 
-			eat( TokType::Capture_Start );
+			eat( Tok_Capture_Start );
 			// <Attributes> <ReturnType> (
 
 			s32 level = 0;
-			while ( left && ( currtok.Type != TokType::Capture_End || level > 0 ) )
+			while ( left && ( currtok.Type != Tok_Capture_End || level > 0 ) )
 			{
-				if ( currtok.Type == TokType::Capture_Start )
+				if ( currtok.Type == Tok_Capture_Start )
 					level++;
 
-				if ( currtok.Type == TokType::Capture_End )
+				if ( currtok.Type == Tok_Capture_End )
 					level--;
 
 				eat( currtok.Type );
 			}
-			eat( TokType::Capture_End );
+			eat( Tok_Capture_End );
 			// <Attributes> <ReturnType> ( <Expression> )
 
-			name.Length = ( ( sptr )prevtok.Text + prevtok.Length ) - ( sptr )name.Text;
+			name.Text.Len = ( ( sptr )prevtok.Text.Ptr + prevtok.Text.Len ) - ( sptr )name.Text.Ptr;
 #endif
 		}
 
 		// Were now dealing with the parameters of the function
-		params = parse_params();
+		params = parse_params(parser_use_parenthesis);
 		// <Attributes> <ReturnType> <All Kinds of nonsense> ( <Parameters> )
 
 		// Look for suffix specifiers for the function
-		while ( left && currtok.is_specifier() )
+		while ( left && tok_is_specifier(currtok) )
 		{
-			SpecifierT spec = ESpecifier::to_type( currtok );
+			Specifier spec = str_to_specifier( tok_to_str(currtok) );
 
-			if ( spec != ESpecifier::Const
+			if ( spec != Spec_Const
 					// TODO : Add support for NoExcept, l-value, volatile, l-value, etc
-					// && spec != ESpecifier::NoExcept
-					&& spec != ESpecifier::RValue )
+					// && spec != Spec_NoExcept
+					&& spec != Spec_RValue )
 			{
-				log_failure( "Error, invalid specifier used in type definition: %s\n%s", currtok.Text, Context.to_string() );
-				Context.pop();
-				return CodeInvalid;
+				log_failure( "Error, invalid specifier used in type definition: %S\n%S", tok_to_str(currtok), strbuilder_to_str( parser_to_strbuilder(_ctx->parser)) );
+				parser_pop(& _ctx->parser);
+				return InvalidCode;
 			}
 
 			specs_found[ NumSpecifiers ] = spec;
@@ -11935,32 +11941,30 @@ else if ( currtok.Type == TokType::DeclType )
 	// <Attributes> <All Kinds of nonsense>
 
 	bool is_param_pack = false;
-	if ( check( TokType::Varadic_Argument ) )
+	if ( check( Tok_Varadic_Argument ) )
 	{
 		is_param_pack = true;
-		eat( TokType::Varadic_Argument );
+		eat( Tok_Varadic_Argument );
 		// <Attributes> <All kinds of nonsense> ...
 	}
 
-	using namespace ECode;
-
-	CodeType result = ( CodeType )make_code();
-	result->Type    = Typename;
-	// result->Token = Context.Scope->Start;
+	CodeTypename result = ( CodeTypename )make_code();
+	result->Type        = CT_Typename;
+	// result->Token = _ctx->parser.Scope->Start;
 
 	// Need to wait until were using the new parsing method to do this.
-	String name_stripped = strip_formatting( name, strip_formatting_dont_preserve_newlines );
+	StrBuilder name_stripped = parser_strip_formatting( tok_to_str(name), parser_strip_formatting_dont_preserve_newlines );
 
 	// name_stripped.strip_space();
 
 #ifdef GEN_USE_NEW_TYPENAME_PARSING
 	if ( params_nested )
 	{
-		name_stripped.append( params_nested->to_string() );
+		name_stripped.append( params_nested->to_strbuilder() );
 	}
 #endif
 
-	result->Name = get_cached_string( name_stripped );
+	result->Name = cache_str( strbuilder_to_str(name_stripped) );
 
 	if ( attributes )
 		result->Attributes = attributes;
@@ -11978,7 +11982,7 @@ else if ( currtok.Type == TokType::DeclType )
 #else
 	if ( NumSpecifiers )
 	{
-		Code specifiers = def_specifiers( NumSpecifiers, ( SpecifierT* )specs_found );
+		CodeSpecifiers specifiers = def_specifiers( NumSpecifiers, ( Specifier* )specs_found );
 		result->Specs   = specifiers;
 	}
 #endif
@@ -11998,160 +12002,190 @@ else if ( currtok.Type == TokType::DeclType )
 	if ( params )
 		result->Params = params;
 
-	Context.pop();
+	result->TypeTag = tag;
+
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeTypedef parse_typedef()
+CodeTypedef parser_parse_typedef()
 {
 	push_scope();
 
 	bool  is_function = false;
-	Token name        = { nullptr, 0, TokType::Invalid };
+	Token name        = NullToken;
 	Code  array_expr  = { nullptr };
 	Code  type        = { nullptr };
 
-	ModuleFlag mflags = ModuleFlag::None;
+	ModuleFlag mflags = ModuleFlag_None;
 
-	if ( check(TokType::Module_Export) )
+	if ( check(Tok_Module_Export) )
 	{
-		mflags = ModuleFlag::Export;
-		eat( TokType::Module_Export );
+		mflags = ModuleFlag_Export;
+		eat( Tok_Module_Export );
 	}
 	// <ModuleFlags>
 
-	eat( TokType::Decl_Typedef );
+	eat( Tok_Decl_Typedef );
 	// <ModuleFlags> typedef
 
-	constexpr bool from_typedef = true;
+	const bool from_typedef = true;
 
+	// TODO(Ed): UPDATE MACRO USAGE HERE
 #if GEN_PARSER_DISABLE_MACRO_TYPEDEF
 	if ( false )
 #else
-	if ( check( TokType::Preprocess_Macro ))
+	b32 valid_macro = false;
+	valid_macro |= left && currtok.Type == Tok_Preprocess_Macro_Typename;
+	valid_macro |= left && currtok.Type == Tok_Preprocess_Macro_Stmt;
+	// if (currtok.Type == Tok_Preprocess_Macro_Stmt)
+	// {
+		// PreprocessMacro* macro = lookup_macro(currtok.Text);
+		// valid_macro |= macro && macro_expects_body(* macro));
+	// }
+
+	Code macro;
+	if ( valid_macro )
 #endif
 	{
-		type = t_empty;
-		name = currtok;
-		Context.Scope->Name = name;
-		eat( TokType::Preprocess_Macro );
+		type          = cast(Code, t_empty);
+		name          = currtok;
+		Code macro    = parse_simple_preprocess(currtok.Type);
+		name.Text.Len = macro->Content.Len;
+		_ctx->parser.Scope->Name = name.Text;
 		// <ModuleFalgs> typedef <Preprocessed_Macro>
+
+		if ( currtok.Type == Tok_Identifier )
+		{
+			type = macro;
+			name = currtok;
+			eat(Tok_Identifier);
+			// <ModuleFalgs> typedef <Preprocessed_Macro> <Identifier>
+		}
 	}
 	else
 	{
 		bool is_complicated =
-				currtok.Type == TokType::Decl_Enum
-			||	currtok.Type == TokType::Decl_Class
-			||	currtok.Type == TokType::Decl_Struct
-			||	currtok.Type == TokType::Decl_Union;
+				currtok.Type == Tok_Decl_Enum
+			||	currtok.Type == Tok_Decl_Class
+			||	currtok.Type == Tok_Decl_Struct
+			||	currtok.Type == Tok_Decl_Union;
+
 
 		// This code is highly correlated with parse_complicated_definition
 		if ( is_complicated )
 		{
-			TokArray tokens = Context.Tokens;
+			TokArray tokens = _ctx->parser.Tokens;
+			TokType  which  = currtok.Type;
 
 			s32 idx = tokens.Idx;
 			s32 level = 0;
-			for ( ; idx < tokens.Arr.num(); idx ++ )
+			for ( ; idx < array_num(tokens.Arr); idx ++ )
 			{
-				if ( tokens[idx].Type == TokType::BraceCurly_Open )
+				if ( tokens.Arr[idx].Type == Tok_BraceCurly_Open )
 					level++;
 
-				if ( tokens[idx].Type == TokType::BraceCurly_Close )
+				if ( tokens.Arr[idx].Type == Tok_BraceCurly_Close )
 					level--;
 
-				if ( level == 0 && tokens[idx].Type == TokType::Statement_End )
+				if ( level == 0 && tokens.Arr[idx].Type == Tok_Statement_End )
 					break;
 			}
 
-			if ( (idx - 2 ) == tokens.Idx )
+			Token pre_foward_tok = currtok;
+			if ( (idx - 3 ) == tokens.Idx )
 			{
 				// Its a forward declaration only
-				type = parse_forward_or_definition( currtok.Type, from_typedef );
+				type = parse_forward_or_definition( which, from_typedef );
 				// <ModuleFalgs> typedef <UnderlyingType: Forward Decl>
 			}
-
-			Token tok = tokens[ idx - 1 ];
-			if ( tok.Type == TokType::Identifier )
-			{
-				tok = tokens[ idx - 2 ];
-
-				bool is_indirection = tok.Type == TokType::Ampersand
-				||                    tok.Type == TokType::Star;
-
-				bool ok_to_parse = false;
-
-				if ( tok.Type == TokType::BraceCurly_Close )
-				{
-					// Its an inplace definition
-					// typdef <which> <type_identifier> { ... } <identifier>;
-					ok_to_parse = true;
-				}
-				else if ( tok.Type == TokType::Identifier && tokens[ idx - 3 ].Type == TokType::Decl_Struct )
-				{
-					// Its a variable with type ID using struct namespace.
-					// <which> <type_identifier> <identifier>;
-					ok_to_parse = true;
-				}
-				else if ( is_indirection )
-				{
-					// Its a indirection type with type ID using struct namespace.
-					// <which> <type_identifier>* <identifier>;
-					ok_to_parse = true;
-				}
-
-				if ( ! ok_to_parse )
-				{
-					log_failure( "Unsupported or bad member definition after struct declaration\n%s", Context.to_string() );
-					Context.pop();
-					return CodeInvalid;
-				}
-
-				// TODO(Ed) : I'm not sure if I have to use parse_type here, I'd rather not as that would complicate parse_type.
-				// type = parse_type();
-				type = parse_forward_or_definition( currtok.Type, from_typedef );
-				// <ModuleFalgs> typedef <UnderlyingType>
-			}
-			else if ( tok.Type == TokType::BraceCurly_Close )
-			{
-				// Its a definition
-				// <which> { ... };
-				type = parse_forward_or_definition( currtok.Type, from_typedef );
-				// <ModuleFalgs> typedef <UnderlyingType>
-			}
-			else if ( tok.Type == TokType::BraceSquare_Close)
-			{
-				// Its an array definition
-				// <which> <type_identifier> <identifier> [ ... ];
-				type = parse_type();
-				// <ModuleFalgs> typedef <UnderlyingType>
-			}
 			else
 			{
-				log_failure( "Unsupported or bad member definition after struct declaration\n%s", Context.to_string() );
-				Context.pop();
-				return CodeInvalid;
+				Token tok = tokens.Arr[ idx - 1 ];
+				if ( tok.Type == Tok_Identifier )
+				{
+					log_fmt("Found id\n");
+					tok = tokens.Arr[ idx - 2 ];
+
+					bool is_indirection = tok.Type == Tok_Ampersand
+					||                    tok.Type == Tok_Star;
+
+					bool ok_to_parse = false;
+
+					Token temp_3 = tokens.Arr[ idx - 3 ];
+
+					if ( tok.Type == Tok_BraceCurly_Close )
+					{
+						// Its an inplace definition
+						// typedef <which> <type_identifier> { ... } <identifier>;
+						ok_to_parse = true;
+					}
+					else if ( tok.Type == Tok_Identifier && tokens.Arr[ idx - 3 ].Type == which )
+					{
+						// Its a variable with type ID using which namespace.
+						// typedef <which> <type_identifier> <identifier>;
+						ok_to_parse = true;
+					}
+					else if ( is_indirection )
+					{
+						// Its a indirection type with type ID using struct namespace.
+						// typedef <which> <type_identifier>* <identifier>;
+						ok_to_parse = true;
+					}
+
+					if ( ! ok_to_parse )
+					{
+						log_failure( "Unsupported or bad member definition after struct declaration\n%SB", parser_to_strbuilder(_ctx->parser) );
+						parser_pop(& _ctx->parser);
+						return InvalidCode;
+					}
+
+					// TODO(Ed) : I'm not sure if I have to use parser_parse_type here, I'd rather not as that would complicate parser_parse_type.
+					// type = parser_parse_type();
+					type = parse_forward_or_definition( which, from_typedef );
+					// <ModuleFalgs> typedef <UnderlyingType>
+				}
+				else if ( tok.Type == Tok_BraceCurly_Close )
+				{
+					// Its a definition
+					// <which> { ... };
+					type = parse_forward_or_definition( currtok.Type, from_typedef );
+					// <ModuleFalgs> typedef <UnderlyingType>
+				}
+				else if ( tok.Type == Tok_BraceSquare_Close)
+				{
+					// Its an array definition
+					// <which> <type_identifier> <identifier> [ ... ];
+					type = cast(Code, parser_parse_type(parser_not_from_template, nullptr));
+					// <ModuleFalgs> typedef <UnderlyingType>
+				}
+				else
+				{
+					log_failure( "Unsupported or bad member definition after struct declaration\n%SB", parser_to_strbuilder(_ctx->parser) );
+					parser_pop(& _ctx->parser);
+					return InvalidCode;
+				}
 			}
 		}
 		else
 		{
 			bool from_template = false;
-			type = parse_type( from_template, &is_function );
+			type = cast(Code, parser_parse_type( from_template, &is_function ));
 			// <ModuleFalgs> typedef <UnderlyingType>
 		}
 
-		if ( check( TokType::Identifier ) )
+		if ( check( Tok_Identifier ) )
 		{
 			name = currtok;
-			eat( TokType::Identifier );
+			eat( Tok_Identifier );
 			// <ModuleFalgs> typedef <UnderlyingType> <Name>
 		}
 		else if ( ! is_function )
 		{
-			log_failure( "Error, expected identifier for typedef\n%s", Context.to_string() );
-			Context.pop();
-			return CodeInvalid;
+			log_failure( "Error, expected identifier for typedef\n%SB", parser_to_strbuilder(_ctx->parser) );
+			parser_pop(& _ctx->parser);
+			return InvalidCode;
 		}
 
 		array_expr = parse_array_decl();
@@ -12159,19 +12193,17 @@ CodeTypedef parse_typedef()
 	}
 
 	Token stmt_end = currtok;
-	eat( TokType::Statement_End );
+	eat( Tok_Statement_End );
 	// <ModuleFalgs> typedef <UnderlyingType> <Name>;
 
-	CodeComment inline_cmt = NoCode;
-	if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
+	CodeComment inline_cmt = NullCode;
+	if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line )
 		inline_cmt = parse_comment();
 		// <ModuleFalgs> typedef <UnderlyingType> <Name> <ArrayExpr>; <InlineCmt>
 
-	using namespace ECode;
-
 	CodeTypedef
 	result              = (CodeTypedef) make_code();
-	result->Type        = Typedef;
+	result->Type        = CT_Typedef;
 	result->ModuleFlags = mflags;
 
 	if ( is_function )
@@ -12181,217 +12213,222 @@ CodeTypedef parse_typedef()
 	}
 	else
 	{
-		result->Name       = get_cached_string( name );
+		result->Name       = cache_str( tok_to_str(name) );
 		result->IsFunction = false;
 	}
 
 	if ( type )
 	{
 		result->UnderlyingType         = type;
-		result->UnderlyingType->Parent = rcast(AST*, result.ast);
+		result->UnderlyingType->Parent = cast(Code, result);
 	}
 	// Type needs to be aware of its parent so that it can be serialized properly.
 
-	if ( type->Type == Typename && array_expr && array_expr->Type != Invalid )
-		type.cast<CodeType>()->ArrExpr = array_expr;
+	if ( type->Type == CT_Typename && array_expr && array_expr->Type != CT_Invalid )
+		cast(CodeTypename, type)->ArrExpr = array_expr;
 
 	if ( inline_cmt )
 		result->InlineCmt = inline_cmt;
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal neverinline
-CodeUnion parse_union( bool inplace_def )
+CodeUnion parser_parse_union( bool inplace_def )
 {
 	push_scope();
 
-	ModuleFlag mflags = ModuleFlag::None;
+	ModuleFlag mflags = ModuleFlag_None;
 
-	if ( check(TokType::Module_Export) )
+	if ( check(Tok_Module_Export) )
 	{
-		mflags = ModuleFlag::Export;
-		eat( TokType::Module_Export );
+		mflags = ModuleFlag_Export;
+		eat( Tok_Module_Export );
 	}
 	// <ModuleFlags>
 
-	eat( TokType::Decl_Union );
+	eat( Tok_Decl_Union );
 	// <ModuleFlags> union
 
 	CodeAttributes attributes = parse_attributes();
 	// <ModuleFlags> union <Attributes>
 
-	StrC name = { 0, nullptr };
-	if ( check( TokType::Identifier ) )
+	Str name = { nullptr, 0 };
+	if ( check( Tok_Identifier ) )
 	{
-		name = currtok;
-		Context.Scope->Name = currtok;
-		eat( TokType::Identifier );
+		name = tok_to_str(currtok);
+		_ctx->parser.Scope->Name = currtok.Text;
+		eat( Tok_Identifier );
 	}
 	// <ModuleFlags> union <Attributes> <Name>
 
 	CodeBody body = { nullptr };
 
-	eat( TokType::BraceCurly_Open );
-	// <ModuleFlags> union <Attributes> <Name> {
-
-	body = make_code();
-	body->Type = ECode::Union_Body;
-
-	while ( ! check_noskip( TokType::BraceCurly_Close ) )
+	if ( ! inplace_def || ! check(Tok_Identifier) )
 	{
-		if ( currtok_noskip.Type == TokType::Preprocess_Hash )
-			eat( TokType::Preprocess_Hash );
+		eat( Tok_BraceCurly_Open );
+		// <ModuleFlags> union <Attributes> <Name> {
 
-		Code member = { nullptr };
-		switch ( currtok_noskip.Type )
+		body = cast(CodeBody, make_code());
+		body->Type = CT_Union_Body;
+
+		while ( ! check_noskip( Tok_BraceCurly_Close ) )
 		{
-			case TokType::NewLine:
-				member = fmt_newline;
-				eat( TokType::NewLine );
-			break;
+			if ( currtok_noskip.Type == Tok_Preprocess_Hash )
+				eat( Tok_Preprocess_Hash );
 
-			case TokType::Comment:
-				member = parse_comment();
-			break;
+			Code member = { nullptr };
+			switch ( currtok_noskip.Type )
+			{
+				case Tok_NewLine:
+					member = fmt_newline;
+					eat( Tok_NewLine );
+				break;
 
-			// TODO(Ed) : Unions can have constructors and destructors
+				case Tok_Comment:
+					member = cast(Code, parse_comment());
+				break;
 
-			case TokType::Decl_Class:
-				member = parse_complicated_definition( TokType::Decl_Class );
-			break;
+				// TODO(Ed) : Unions can have constructors and destructors
 
-			case TokType::Decl_Enum:
-				member = parse_complicated_definition( TokType::Decl_Enum );
-			break;
+				case Tok_Decl_Class:
+					member = parse_complicated_definition( Tok_Decl_Class );
+				break;
 
-			case TokType::Decl_Struct:
-				member = parse_complicated_definition( TokType::Decl_Struct );
-			break;
+				case Tok_Decl_Enum:
+					member = parse_complicated_definition( Tok_Decl_Enum );
+				break;
 
-			case TokType::Decl_Union:
-				member = parse_complicated_definition( TokType::Decl_Union );
-			break;
+				case Tok_Decl_Struct:
+					member = parse_complicated_definition( Tok_Decl_Struct );
+				break;
 
-			case TokType::Preprocess_Define:
-				member = parse_define();
-			break;
+				case Tok_Decl_Union:
+					member = parse_complicated_definition( Tok_Decl_Union );
+				break;
 
-			case TokType::Preprocess_If:
-			case TokType::Preprocess_IfDef:
-			case TokType::Preprocess_IfNotDef:
-			case TokType::Preprocess_ElIf:
-				member = parse_preprocess_cond();
-			break;
+				case Tok_Preprocess_Define:
+					member = cast(Code, parser_parse_define());
+				break;
 
-			case TokType::Preprocess_Else:
-				member = preprocess_else;
-				eat( TokType::Preprocess_Else );
-			break;
+				case Tok_Preprocess_If:
+				case Tok_Preprocess_IfDef:
+				case Tok_Preprocess_IfNotDef:
+				case Tok_Preprocess_ElIf:
+					member = cast(Code, parse_preprocess_cond());
+				break;
 
-			case TokType::Preprocess_EndIf:
-				member = preprocess_endif;
-				eat( TokType::Preprocess_EndIf );
-			break;
+				case Tok_Preprocess_Else:
+					member = cast(Code, preprocess_else);
+					eat( Tok_Preprocess_Else );
+				break;
 
-			case TokType::Preprocess_Macro:
-				member = parse_simple_preprocess( TokType::Preprocess_Macro );
-			break;
+				case Tok_Preprocess_EndIf:
+					member = cast(Code, preprocess_endif);
+					eat( Tok_Preprocess_EndIf );
+				break;
 
-			case TokType::Preprocess_Pragma:
-				member = parse_pragma();
-			break;
+				case Tok_Preprocess_Macro_Typename:
+					// Its a variable with a macro typename
+					member = cast(Code, parser_parse_variable());
+				break;
 
-			case TokType::Preprocess_Unsupported:
-				member = parse_simple_preprocess( TokType::Preprocess_Unsupported );
-			break;
+				case Tok_Preprocess_Macro_Stmt:
+					member = parse_simple_preprocess( Tok_Preprocess_Macro_Stmt );
+				break;
 
-			default:
-				member = parse_variable();
-			break;
+				case Tok_Preprocess_Pragma:
+					member = cast(Code, parse_pragma());
+				break;
+
+				case Tok_Preprocess_Unsupported:
+					member = parse_simple_preprocess( Tok_Preprocess_Unsupported );
+				break;
+
+				default:
+					member = cast(Code, parser_parse_variable());
+				break;
+			}
+
+			if ( member )
+				body_append(body, member );
 		}
+		// <ModuleFlags> union <Attributes> <Name> { <Body>
 
-		if ( member )
-			body.append( member );
+		eat( Tok_BraceCurly_Close );
+		// <ModuleFlags> union <Attributes> <Name> { <Body> }
 	}
-	// <ModuleFlags> union <Attributes> <Name> { <Body>
-
-	eat( TokType::BraceCurly_Close );
-	// <ModuleFlags> union <Attributes> <Name> { <Body> }
 
 	if ( ! inplace_def )
-		eat( TokType::Statement_End );
+		eat( Tok_Statement_End );
 		// <ModuleFlags> union <Attributes> <Name> { <Body> };
 
 	CodeUnion
 	result = (CodeUnion) make_code();
-	result->Type        = ECode::Union;
+	result->Type        = body ? CT_Union : CT_Union_Fwd;
 	result->ModuleFlags = mflags;
 
-	if ( name )
-		result->Name = get_cached_string( name );
+	if ( name.Len )
+		result->Name = cache_str( name );
 
-	if ( body )
-		result->Body = body;
+	result->Body       = body;
+	result->Attributes = attributes;
 
-	if ( attributes )
-		result->Attributes = attributes;
-
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeUsing parse_using()
+CodeUsing parser_parse_using()
 {
 	push_scope();
 
-	SpecifierT specs_found[16] { ESpecifier::Invalid };
+	Specifier specs_found[16] = { Spec_Invalid };
 	s32        NumSpecifiers = 0;
 
-	Token    name       = { nullptr, 0, TokType::Invalid };
-	Code     array_expr = { nullptr };
-	CodeType type       = { nullptr };
+	Token        name       = NullToken;
+	Code         array_expr = { nullptr };
+	CodeTypename type       = { nullptr };
 
 	bool is_namespace = false;
 
-	ModuleFlag     mflags     = ModuleFlag::None;
+	ModuleFlag     mflags     = ModuleFlag_None;
 	CodeAttributes attributes = { nullptr };
 
-	if ( check(TokType::Module_Export) )
+	if ( check(Tok_Module_Export) )
 	{
-		mflags = ModuleFlag::Export;
-		eat( TokType::Module_Export );
+		mflags = ModuleFlag_Export;
+		eat( Tok_Module_Export );
 	}
 	// <ModuleFlags>
 
-	eat( TokType::Decl_Using );
+	eat( Tok_Decl_Using );
 	// <ModuleFlags> using
 
-	if ( currtok.Type == TokType::Decl_Namespace )
+	if ( currtok.Type == Tok_Decl_Namespace ) 
 	{
 		is_namespace = true;
-		eat( TokType::Decl_Namespace );
+		eat( Tok_Decl_Namespace );
 		// <ModuleFlags> using namespace
 	}
 
 	name = currtok;
-	Context.Scope->Name = name;
-	eat( TokType::Identifier );
+	_ctx->parser.Scope->Name = name.Text;
+	eat( Tok_Identifier );
 	// <ModuleFlags> using <namespace> <Name>
 
 	if ( ! is_namespace )
 	{
-		if ( bitfield_is_equal( u32, currtok.Flags, TF_Assign ) )
+		if ( bitfield_is_set( u32, currtok.Flags, TF_Assign ) )
 		{
 			attributes = parse_attributes();
 			// <ModuleFlags> using <Name> <Attributes>
 
-			eat( TokType::Operator );
+			eat( Tok_Operator );
 			// <ModuleFlags> using <Name> <Attributes> =
 
-			type = parse_type();
+			type = parser_parse_type(parser_not_from_template, nullptr);
 			// <ModuleFlags> using <Name> <Attributes> = <UnderlyingType>
 
 			array_expr = parse_array_decl();
@@ -12400,30 +12437,27 @@ CodeUsing parse_using()
 	}
 
 	Token stmt_end = currtok;
-	eat( TokType::Statement_End );
+	eat( Tok_Statement_End );
 	// <ModuleFlags> using <namespace> <Attributes> <Name> = <UnderlyingType>;
 
-	CodeComment inline_cmt = NoCode;
-	if ( currtok_noskip.Type == TokType::Comment && currtok_noskip.Line == stmt_end.Line )
-	{
+	CodeComment inline_cmt = NullCode;
+	if ( currtok_noskip.Type == Tok_Comment && currtok_noskip.Line == stmt_end.Line ) {
 		inline_cmt = parse_comment();
 	}
 	// <ModuleFlags> using <namespace> <Attributes> <Name> = <UnderlyingType>; <InlineCmt>
 
-	using namespace ECode;
-
 	CodeUsing
 	result              = (CodeUsing) make_code();
-	result->Name        = get_cached_string( name );
+	result->Name        = cache_str( tok_to_str(name) );
 	result->ModuleFlags = mflags;
 
 	if ( is_namespace)
 	{
-		result->Type = Using_Namespace;
+		result->Type = CT_Using_Namespace;
 	}
 	else
 	{
-		result->Type = Using;
+		result->Type = CT_Using;
 
 		if ( type )
 			result->UnderlyingType = type;
@@ -12438,59 +12472,47 @@ CodeUsing parse_using()
 			result->InlineCmt = inline_cmt;
 	}
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
 internal
-CodeVar parse_variable()
+CodeVar parser_parse_variable()
 {
 	push_scope();
 
-	SpecifierT specs_found[16] { ESpecifier::NumSpecifiers };
-	s32        NumSpecifiers = 0;
+	Specifier specs_found[16] = { Spec_NumSpecifiers };
+	s32       NumSpecifiers = 0;
 
-	ModuleFlag	   mflags     = ModuleFlag::None;
+	ModuleFlag	   mflags     = ModuleFlag_None;
 	CodeAttributes attributes = { nullptr };
 	CodeSpecifiers specifiers = { nullptr };
 
-	if ( check(TokType::Module_Export) )
-	{
-		mflags = ModuleFlag::Export;
-		eat( TokType::Module_Export );
+	if ( check(Tok_Module_Export) ) {
+		mflags = ModuleFlag_Export;
+		eat( Tok_Module_Export );
 	}
 	// <ModuleFlags>
 
 	attributes = parse_attributes();
 	// <ModuleFlags> <Attributes>
 
-	while ( left && currtok.is_specifier() )
+	while ( left && tok_is_specifier(currtok) )
 	{
-		SpecifierT spec = ESpecifier::to_type( currtok );
-
-		switch ( spec )
+		Specifier spec = str_to_specifier( tok_to_str(currtok) );
+		switch  ( spec )
 		{
-			case ESpecifier::Const:
-			case ESpecifier::Constexpr:
-			case ESpecifier::Constinit:
-			case ESpecifier::External_Linkage:
-			case ESpecifier::Global:
-			case ESpecifier::Inline:
-			case ESpecifier::Local_Persist:
-			case ESpecifier::Mutable:
-			case ESpecifier::Static:
-			case ESpecifier::Thread_Local:
-			case ESpecifier::Volatile:
+			GEN_PARSER_VARIABLE_ALLOWED_SPECIFIER_CASES:
 			break;
 
 			default:
-				log_failure( "Invalid specifier %s for variable\n%s", ESpecifier::to_str( spec ), Context.to_string() );
-				Context.pop();
-				return CodeInvalid;
+				log_failure( "Invalid specifier %S for variable\n%S", spec_to_str( spec ), strbuilder_to_str( parser_to_strbuilder(_ctx->parser)) );
+				parser_pop(& _ctx->parser);
+				return InvalidCode;
 		}
 
 		// Ignore const specifiers, they're handled by the type
-		if ( spec == ESpecifier::Const )
+		if ( spec == Spec_Const )
 			break;
 
 		specs_found[NumSpecifiers] = spec;
@@ -12498,30 +12520,39 @@ CodeVar parse_variable()
 		eat( currtok.Type );
 	}
 
-	if ( NumSpecifiers )
-	{
+	if ( NumSpecifiers ) {
 		specifiers = def_specifiers( NumSpecifiers, specs_found );
 	}
 	// <ModuleFlags> <Attributes> <Specifiers>
 
-	CodeType type = parse_type();
+	// Note(Ed): We're enforcing that using this codepath requires non-macro jank.
+	// Code macro_stmt = parse_macro_as_definiton(attributes, specifiers);
+	// if (macro_stmt) {
+	// 	parser_pop(& _ctx->parser);
+	// 	return macro_stmt;
+	// }
+
+	CodeTypename type = parser_parse_type(parser_not_from_template, nullptr);
 	// <ModuleFlags> <Attributes> <Specifiers> <ValueType>
 
-	if ( type == Code::Invalid )
-		return CodeInvalid;
+	if ( cast(Code, type) == Code_Invalid )
+		return InvalidCode;
 
-	Context.Scope->Name = parse_identifier();
+	_ctx->parser.Scope->Name = parse_identifier(nullptr).Text;
 	// <ModuleFlags> <Attributes> <Specifiers> <ValueType> <Name>
 
-	CodeVar result = parse_variable_after_name( mflags, attributes, specifiers, type, Context.Scope->Name );
+	CodeVar result = parse_variable_after_name( mflags, attributes, specifiers, type, _ctx->parser.Scope->Name );
 	// Regular  : <ModuleFlags> <Attributes> <Specifiers> <ValueType> <Name>                  = <Value>; <InlineCmt>
 	// Bitfield : <ModuleFlags> <Attributes> <Specifiers> <ValueType> <Name> : <BitfieldSize> = <Value>; <InlineCmt>
 
-	Context.pop();
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
-// namespace parser
+internal
+CodeTypename parser_parse_type_alt( bool from_template, bool* typedef_is_functon )
+{
+	return InvalidCode;
 }
 
 #ifdef CHECK_WAS_DEFINED
@@ -12530,60 +12561,58 @@ CodeVar parse_variable()
 
 // Publically Exposed Interface
 
-CodeClass parse_class( StrC def )
+CodeClass parse_class( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
+	_ctx->parser.Tokens = toks;
 	push_scope();
-	CodeClass result = (CodeClass) parse_class_struct( TokType::Decl_Class );
-	Context.pop();
+	CodeClass result = (CodeClass) parse_class_struct( Tok_Decl_Class, parser_not_inplace_def );
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
-CodeConstructor parse_constructor( StrC def )
+CodeConstructor parse_constructor( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
 	// TODO(Ed): Constructors can have prefix attributes
 
-	CodeSpecifiers specifiers;
-	SpecifierT     specs_found[ 16 ] { ESpecifier::NumSpecifiers };
+	CodeSpecifiers specifiers = NullCode;
+	Specifier      specs_found[ 16 ] = { Spec_NumSpecifiers };
 	s32            NumSpecifiers = 0;
 
-	while ( left && currtok.is_specifier() )
+	while ( left && tok_is_specifier(currtok) )
 	{
-		SpecifierT spec = ESpecifier::to_type( currtok );
+		Specifier spec = str_to_specifier( tok_to_str(currtok) );
 
 		b32 ignore_spec = false;
 
 		switch ( spec )
 		{
-			case ESpecifier::Constexpr :
-			case ESpecifier::Explicit:
-			case ESpecifier::Inline :
-			case ESpecifier::ForceInline :
-			case ESpecifier::NeverInline :
+			case Spec_Constexpr :
+			case Spec_Explicit:
+			case Spec_Inline :
+			case Spec_ForceInline :
+			case Spec_NeverInline :
 				break;
 
-			case ESpecifier::Const :
+			case Spec_Const :
 				ignore_spec = true;
 				break;
 
 			default :
-				log_failure( "Invalid specifier %s for variable\n%s", ESpecifier::to_str( spec ), Context.to_string() );
-				Context.pop();
-				return CodeInvalid;
+				log_failure( "Invalid specifier %s for variable\n%S", spec_to_str( spec ), parser_to_strbuilder(_ctx->parser) );
+				parser_pop(& _ctx->parser);
+				return InvalidCode;
 		}
 
 		// Every specifier after would be considered part of the type type signature
@@ -12601,281 +12630,289 @@ CodeConstructor parse_constructor( StrC def )
 		// <specifiers> ...
 	}
 
-	Context.Tokens         = toks;
-	CodeConstructor result = parse_constructor( specifiers );
+	_ctx->parser.Tokens         = toks;
+	CodeConstructor result = parser_parse_constructor( specifiers );
 	return result;
 }
 
-CodeDestructor parse_destructor( StrC def )
+CodeDefine parse_define( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
+
+	_ctx->parser.Tokens = toks;
+	push_scope();
+	CodeDefine result = parser_parse_define();
+	parser_pop(& _ctx->parser);
+	return result;
+}
+
+CodeDestructor parse_destructor( Str def )
+{
+	check_parse_args( def );
+
+	TokArray toks = lex( def );
+	if ( toks.Arr == nullptr )
+		return InvalidCode;
 
 	// TODO(Ed): Destructors can have prefix attributes
 	// TODO(Ed): Destructors can have virtual
 
-	Context.Tokens        = toks;
-	CodeDestructor result = parse_destructor();
+	_ctx->parser.Tokens        = toks;
+	CodeDestructor result = parser_parse_destructor(NullCode);
 	return result;
 }
 
-CodeEnum parse_enum( StrC def )
+CodeEnum parse_enum( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
 	{
-		Context.pop();
-		return CodeInvalid;
+		parser_pop(& _ctx->parser);
+		return InvalidCode;
 	}
 
-	Context.Tokens = toks;
-	return parse_enum();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_enum( parser_not_inplace_def);
 }
 
-CodeBody parse_export_body( StrC def )
+CodeBody parse_export_body( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return parse_export_body();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_export_body();
 }
 
-CodeExtern parse_extern_link( StrC def )
+CodeExtern parse_extern_link( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return parse_extern_link();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_extern_link();
 }
 
-CodeFriend parse_friend( StrC def )
+CodeFriend parse_friend( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return parse_friend();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_friend();
 }
 
-CodeFn parse_function( StrC def )
+CodeFn parse_function( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return (CodeFn) parse_function();
+	_ctx->parser.Tokens = toks;
+	return (CodeFn) parser_parse_function();
 }
 
-CodeBody parse_global_body( StrC def )
+CodeBody parse_global_body( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
+	_ctx->parser.Tokens = toks;
 	push_scope();
-	CodeBody result = parse_global_nspace( ECode::Global_Body );
-	Context.pop();
+	CodeBody result = parse_global_nspace( CT_Global_Body );
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
-CodeNS parse_namespace( StrC def )
+CodeNS parse_namespace( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return parse_namespace();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_namespace();
 }
 
-CodeOperator parse_operator( StrC def )
+CodeOperator parse_operator( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return (CodeOperator) parse_operator();
+	_ctx->parser.Tokens = toks;
+	return (CodeOperator) parser_parse_operator();
 }
 
-CodeOpCast parse_operator_cast( StrC def )
+CodeOpCast parse_operator_cast( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return parse_operator_cast();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_operator_cast(NullCode);
 }
 
-CodeStruct parse_struct( StrC def )
+CodeStruct parse_struct( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
+	_ctx->parser.Tokens = toks;
 	push_scope();
-	CodeStruct result = (CodeStruct) parse_class_struct( TokType::Decl_Struct );
-	Context.pop();
+	CodeStruct result = (CodeStruct) parse_class_struct( Tok_Decl_Struct, parser_not_inplace_def );
+	parser_pop(& _ctx->parser);
 	return result;
 }
 
-CodeTemplate parse_template( StrC def )
+CodeTemplate parse_template( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return parse_template();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_template();
 }
 
-CodeType parse_type( StrC def )
+CodeTypename parse_type( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return parse_type();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_type( parser_not_from_template, nullptr);
 }
 
-CodeTypedef parse_typedef( StrC def )
+CodeTypedef parse_typedef( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return parse_typedef();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_typedef();
 }
 
-CodeUnion parse_union( StrC def )
+CodeUnion parse_union( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return parse_union();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_union( parser_not_inplace_def);
 }
 
-CodeUsing parse_using( StrC def )
+CodeUsing parse_using( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return parse_using();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_using();
 }
 
-CodeVar parse_variable( StrC def )
+CodeVar parse_variable( Str def )
 {
 	check_parse_args( def );
-	using namespace parser;
 
 	TokArray toks = lex( def );
 	if ( toks.Arr == nullptr )
-		return CodeInvalid;
+		return InvalidCode;
 
-	Context.Tokens = toks;
-	return parse_variable();
+	_ctx->parser.Tokens = toks;
+	return parser_parse_variable();
 }
 
 // Undef helper macros
-#	undef check_parse_args
-#	undef currtok
-#	undef prevtok
-#   undef nexttok
-#	undef eat
-#	undef left
-#	undef check
-#	undef push_scope
+#undef check_parse_args
+#undef currtok_noskip
+#undef currtok
+#undef peektok
+#undef prevtok
+#undef nexttok
+#undef nexttok_noskip
+#undef eat
+#undef left
+#undef check
+#undef push_scope
+#undef def_assign
+
+// Here for C Variant
+#undef lex_dont_skip_formatting
+#undef lex_skip_formatting
+
+#undef parser_inplace_def
+#undef parser_not_inplace_def
+#undef parser_dont_consume_braces
+#undef parser_consume_braces
+#undef parser_not_from_template
+#undef parser_use_parenthesis
+#undef parser_strip_formatting_dont_preserve_newlines
 
 ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va )
 {
 	char const* buf_begin = buf;
-	ssize          remaining = buf_size;
+	ssize       remaining = buf_size;
 
-	local_persist
-	Arena tok_map_arena;
-
-	HashTable<StrC> tok_map;
+	local_persist StringTable tok_map;
+	do_once() {
+		tok_map = hashtable_init(Str, _ctx->Allocator_DyanmicContainers );
+	}
+	// Populate token pairs
 	{
-		local_persist
-		char tok_map_mem[ TokenFmt_TokenMap_MemSize ];
-
-		tok_map_arena = Arena::init_from_memory( tok_map_mem, sizeof(tok_map_mem) );
-		tok_map       = HashTable<StrC>::init( tok_map_arena );
-
 		s32 left = num_tokens - 1;
 
 		while ( left-- )
 		{
 			char const* token = va_arg( va, char const* );
-			StrC        value = va_arg( va, StrC );
+			Str         value = va_arg( va, Str );
 
-			u32 key = crc32( token, str_len(token) );
-
-			tok_map.set( key, value );
+			u32 key = crc32( token, c_str_len(token) );
+			hashtable_set( tok_map, key, value );
 		}
 	}
 
@@ -12911,7 +12948,7 @@ ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va )
 			char const* token = fmt + 1;
 
 			u32       key   = crc32( token, tok_len );
-			StrC*     value = tok_map.get( key );
+			Str*     value = hashtable_get(tok_map, key );
 
 			if ( value )
 			{
@@ -12940,33 +12977,29 @@ ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va )
 			current = * fmt;
 		}
 	}
-
-	tok_map.clear();
-	tok_map_arena.free();
-
+	hashtable_clear(tok_map);
 	ssize result = buf_size - remaining;
-
 	return result;
 }
 
-Code untyped_str( StrC content )
+Code untyped_str( Str content )
 {
 	if ( content.Len == 0 )
 	{
 		log_failure( "untyped_str: empty string" );
-		return CodeInvalid;
+		return InvalidCode;
 	}
 
 	Code
 	result          = make_code();
-	result->Name    = get_cached_string( content );
-	result->Type    = ECode::Untyped;
+	result->Name    = cache_str( content );
+	result->Type    = CT_Untyped;
 	result->Content = result->Name;
 
-	if ( result->Name == nullptr )
+	if ( result->Name.Len == 0 )
 	{
 		log_failure( "untyped_str: could not cache string" );
-		return CodeInvalid;
+		return InvalidCode;
 	}
 
 	return result;
@@ -12977,7 +13010,7 @@ Code untyped_fmt( char const* fmt, ...)
 	if ( fmt == nullptr )
 	{
 		log_failure( "untyped_fmt: null format string" );
-		return CodeInvalid;
+		return InvalidCode;
 	}
 
 	local_persist thread_local
@@ -12985,50 +13018,51 @@ Code untyped_fmt( char const* fmt, ...)
 
 	va_list va;
 	va_start(va, fmt);
-	ssize length = str_fmt_va(buf, GEN_PRINTF_MAXLEN, fmt, va);
+	ssize length = c_str_fmt_va(buf, GEN_PRINTF_MAXLEN, fmt, va);
 	va_end(va);
+    Str content = { buf, length };
 
 	Code
 	result          = make_code();
-	result->Name    = get_cached_string( { str_len(fmt, MaxNameLength), fmt } );
-	result->Type    = ECode::Untyped;
-	result->Content = get_cached_string( { length, buf } );
+	result->Type    = CT_Untyped;
+	result->Content = cache_str( content );
 
-	if ( result->Name == nullptr )
+	if ( result->Name.Len == 0 )
 	{
 		log_failure( "untyped_fmt: could not cache string" );
-		return CodeInvalid;
+		return InvalidCode;
 	}
 
 	return result;
 }
 
-Code untyped_token_fmt( s32 num_tokens, ... )
+Code untyped_token_fmt( s32 num_tokens, char const* fmt, ... )
 {
 	if ( num_tokens == 0 )
 	{
 		log_failure( "untyped_token_fmt: zero tokens" );
-		return CodeInvalid;
+		return InvalidCode;
 	}
 
 	local_persist thread_local
 	char buf[GEN_PRINTF_MAXLEN] = { 0 };
 
 	va_list va;
-	va_start(va, num_tokens);
+	va_start(va, fmt);
 	ssize length = token_fmt_va(buf, GEN_PRINTF_MAXLEN, num_tokens, va);
 	va_end(va);
 
+	Str buf_str = { buf, length };
+
 	Code
 	result          = make_code();
-	result->Name    = get_cached_string( { length, buf } );
-	result->Type    = ECode::Untyped;
-	result->Content = result->Name;
+	result->Type    = CT_Untyped;
+	result->Content = cache_str( buf_str );
 
-	if ( result->Name == nullptr )
+	if ( result->Name.Len == 0 )
 	{
 		log_failure( "untyped_fmt: could not cache string" );
-		return CodeInvalid;
+		return InvalidCode;
 	}
 
 	return result;
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/gen.dep.cpp b/Project/Source/GasaEditor/GasaGen/gencpp/gen.dep.cpp
index ca48243..d1a5e57 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/gen.dep.cpp
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/gen.dep.cpp
@@ -11,6 +11,9 @@
 #   pragma clang diagnostic ignored "-Wunknown-pragmas"
 #	pragma clang diagnostic ignored "-Wvarargs"
 #	pragma clang diagnostic ignored "-Wunused-function"
+#	pragma clang diagnostic ignored "-Wbraced-scalar-init"
+#   pragma clang diagnostic ignored "-W#pragma-messages"
+#	pragma clang diagnostic ignored "-Wstatic-in-inline"
 #endif
 
 #ifdef __GNUC__
@@ -31,9 +34,9 @@
 #			define _printf_err( fmt, ... )   fprintf( stderr, fmt, __VA_ARGS__ )
 #			define _printf_err_va( fmt, va ) vfprintf( stderr, fmt, va )
 #		else
-#			define _strlen                   str_len
-#			define _printf_err( fmt, ... )   str_fmt_out_err( fmt, __VA_ARGS__ )
-#			define _printf_err_va( fmt, va ) str_fmt_out_err_va( fmt, va )
+#			define _strlen                   c_str_len
+#			define _printf_err( fmt, ... )   c_str_fmt_out_err( fmt, __VA_ARGS__ )
+#			define _printf_err_va( fmt, va ) c_str_fmt_out_err_va( fmt, va )
 #		endif
 #	endif
 #
@@ -106,9 +109,9 @@ GEN_NS_BEGIN
 
 #pragma region Debug
 
-void assert_handler( char const* condition, char const* file, s32 line, char const* msg, ... )
+void assert_handler( char const* condition, char const* file, char const* function, s32 line, char const* msg, ... )
 {
-	_printf_err( "%s:(%d): Assert Failure: ", file, line );
+	_printf_err( "%s - %s:(%d): Assert Failure: ", file, function, line );
 
 	if ( condition )
 		_printf_err( "`%s` \n", condition );
@@ -161,7 +164,7 @@ ssize _scan_zpl_i64( const char* text, s32 base, s64* value )
 		text++;
 	}
 
-	if ( base == 16 && str_compare( text, "0x", 2 ) == 0 )
+	if ( base == 16 && c_str_compare_len( text, "0x", 2 ) == 0 )
 		text += 2;
 
 	for ( ;; )
@@ -196,14 +199,14 @@ global const char _num_to_char_table[] =
 	"abcdefghijklmnopqrstuvwxyz"
 	"@$";
 
-s64 str_to_i64( const char* str, char** end_ptr, s32 base )
+s64 c_str_to_i64( const char* str, char** end_ptr, s32 base )
 {
 	ssize  len;
 	s64 value;
 
 	if ( ! base )
 	{
-		if ( ( str_len( str ) > 2 ) && ( str_compare( str, "0x", 2 ) == 0 ) )
+		if ( ( c_str_len( str ) > 2 ) && ( c_str_compare_len( str, "0x", 2 ) == 0 ) )
 			base = 16;
 		else
 			base = 10;
@@ -243,7 +246,7 @@ void i64_to_str( s64 value, char* string, s32 base )
 	if ( negative )
 		*buf++ = '-';
 	*buf = '\0';
-	str_reverse( string );
+	c_str_reverse( string );
 }
 
 void u64_to_str( u64 value, char* string, s32 base )
@@ -264,10 +267,10 @@ void u64_to_str( u64 value, char* string, s32 base )
 	}
 	*buf = '\0';
 
-	str_reverse( string );
+	c_str_reverse( string );
 }
 
-f64 str_to_f64( const char* str, char** end_ptr )
+f64 c_str_to_f64( const char* str, char** end_ptr )
 {
 	f64 result, value, sign, scale;
 	s32 frac;
@@ -384,6 +387,7 @@ enum
 	GEN_FMT_INTS = GEN_FMT_CHAR | GEN_FMT_SHORT | GEN_FMT_INT | GEN_FMT_LONG | GEN_FMT_LLONG | GEN_FMT_SIZE | GEN_FMT_INTPTR
 };
 
+typedef struct _format_info _format_info;
 struct _format_info
 {
 	s32 base;
@@ -394,13 +398,13 @@ struct _format_info
 
 internal ssize _print_string( char* text, ssize max_len, _format_info* info, char const* str )
 {
-	ssize    res = 0, len = 0;
-	ssize    remaining = max_len;
+	ssize res = 0, len = 0;
+	ssize remaining = max_len;
 	char* begin     = text;
 
 	if ( str == NULL && max_len >= 6 )
 	{
-		res += str_copy_nulpad( text, "(null)", 6 );
+		res += c_str_copy_nulpad( text, "(null)", 6 );
 		return res;
 	}
 
@@ -408,7 +412,7 @@ internal ssize _print_string( char* text, ssize max_len, _format_info* info, cha
 		// Made the design decision for this library that precision is the length of the string.
 		len = info->precision;
 	else
-		len = str_len( str );
+		len = c_str_len( str );
 
 	if ( info && ( info->width == 0 && info->flags & GEN_FMT_WIDTH ) )
 	{
@@ -421,7 +425,7 @@ internal ssize _print_string( char* text, ssize max_len, _format_info* info, cha
 			len = info->precision < len ? info->precision : len;
 		if ( res + len > max_len )
 			return res;
-		res  += str_copy_nulpad( text, str, len );
+		res  += c_str_copy_nulpad( text, str, len );
 		text += res;
 
 		if ( info->width > res )
@@ -445,15 +449,15 @@ internal ssize _print_string( char* text, ssize max_len, _format_info* info, cha
 
 		if ( res + len > max_len )
 			return res;
-		res += str_copy_nulpad( text, str, len );
+		res += c_str_copy_nulpad( text, str, len );
 	}
 
 	if ( info )
 	{
 		if ( info->flags & GEN_FMT_UPPER )
-			str_to_upper( begin );
+			c_str_to_upper( begin );
 		else if ( info->flags & GEN_FMT_LOWER )
-			str_to_lower( begin );
+			c_str_to_lower( begin );
 	}
 
 	return res;
@@ -590,7 +594,7 @@ internal ssize _print_f64( char* text, ssize max_len, _format_info* info, b32 is
 	return ( text - text_begin );
 }
 
-neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_list va )
+neverinline ssize c_str_fmt_va( char* text, ssize max_len, char const* fmt, va_list va )
 {
 	char const* text_begin = text;
 	ssize          remaining  = max_len, res;
@@ -598,7 +602,7 @@ neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_lis
 	while ( *fmt )
 	{
 		_format_info info = { 0 };
-		ssize           len  = 0;
+		ssize        len  = 0;
 		info.precision    = -1;
 
 		while ( *fmt && *fmt != '%' && remaining )
@@ -662,7 +666,7 @@ neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_lis
 		}
 		else
 		{
-			info.width = scast( s32, str_to_i64( fmt, ccast( char**, & fmt), 10 ));
+			info.width = scast( s32, c_str_to_i64( fmt, ccast( char**, & fmt), 10 ));
 			if ( info.width != 0 )
 			{
 				info.flags |= GEN_FMT_WIDTH;
@@ -680,7 +684,7 @@ neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_lis
 			}
 			else
 			{
-				info.precision = scast( s32, str_to_i64( fmt, ccast( char**, & fmt), 10 ));
+				info.precision = scast( s32, c_str_to_i64( fmt, ccast( char**, & fmt), 10 ));
 			}
 			info.flags &= ~GEN_FMT_ZERO;
 		}
@@ -771,10 +775,20 @@ neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_lis
 
 			case 'S':
 			{
-				String gen_str = String { va_arg( va, char*) };
+				if ( *(fmt + 1) == 'B' )
+				{
 
-				info.precision = gen_str.length();
-				len            = _print_string( text, remaining, &info, gen_str );
+					++ fmt;
+					StrBuilder gen_str = { va_arg( va, char*) };
+
+					info.precision = strbuilder_length(gen_str);
+					len            = _print_string( text, remaining, &info, gen_str );
+					break;
+				}
+
+				Str gen_str    = va_arg( va, Str);
+				info.precision = gen_str.Len;
+				len            = _print_string( text, remaining, &info, gen_str.Ptr );
 			}
 			break;
 
@@ -874,67 +888,67 @@ neverinline ssize str_fmt_va( char* text, ssize max_len, char const* fmt, va_lis
 	return ( res >= max_len || res < 0 ) ? -1 : res;
 }
 
-char* str_fmt_buf_va( char const* fmt, va_list va )
+char* c_str_fmt_buf_va( char const* fmt, va_list va )
 {
 	local_persist thread_local char buffer[ GEN_PRINTF_MAXLEN ];
-	str_fmt_va( buffer, size_of( buffer ), fmt, va );
+	c_str_fmt_va( buffer, size_of( buffer ), fmt, va );
 	return buffer;
 }
 
-char* str_fmt_buf( char const* fmt, ... )
+char* c_str_fmt_buf( char const* fmt, ... )
 {
 	va_list va;
 	char*   str;
 	va_start( va, fmt );
-	str = str_fmt_buf_va( fmt, va );
+	str = c_str_fmt_buf_va( fmt, va );
 	va_end( va );
 	return str;
 }
 
-ssize str_fmt_file_va( struct FileInfo* f, char const* fmt, va_list va )
+ssize c_str_fmt_file_va( FileInfo* f, char const* fmt, va_list va )
 {
 	local_persist thread_local char buf[ GEN_PRINTF_MAXLEN ];
-	ssize                              len = str_fmt_va( buf, size_of( buf ), fmt, va );
+	ssize                              len = c_str_fmt_va( buf, size_of( buf ), fmt, va );
 	b32                             res = file_write( f, buf, len - 1 );    // NOTE: prevent extra whitespace
 	return res ? len : -1;
 }
 
-ssize str_fmt_file( struct FileInfo* f, char const* fmt, ... )
+ssize c_str_fmt_file( FileInfo* f, char const* fmt, ... )
 {
 	ssize      res;
 	va_list va;
 	va_start( va, fmt );
-	res = str_fmt_file_va( f, fmt, va );
+	res = c_str_fmt_file_va( f, fmt, va );
 	va_end( va );
 	return res;
 }
 
-ssize str_fmt( char* str, ssize n, char const* fmt, ... )
+ssize c_str_fmt( char* str, ssize n, char const* fmt, ... )
 {
 	ssize      res;
 	va_list va;
 	va_start( va, fmt );
-	res = str_fmt_va( str, n, fmt, va );
+	res = c_str_fmt_va( str, n, fmt, va );
 	va_end( va );
 	return res;
 }
 
-ssize str_fmt_out_va( char const* fmt, va_list va )
+ssize c_str_fmt_out_va( char const* fmt, va_list va )
 {
-	return str_fmt_file_va( file_get_standard( EFileStandard_OUTPUT ), fmt, va );
+	return c_str_fmt_file_va( file_get_standard( EFileStandard_OUTPUT ), fmt, va );
 }
 
-ssize str_fmt_out_err_va( char const* fmt, va_list va )
+ssize c_str_fmt_out_err_va( char const* fmt, va_list va )
 {
-	return str_fmt_file_va( file_get_standard( EFileStandard_ERROR ), fmt, va );
+	return c_str_fmt_file_va( file_get_standard( EFileStandard_ERROR ), fmt, va );
 }
 
-ssize str_fmt_out_err( char const* fmt, ... )
+ssize c_str_fmt_out_err( char const* fmt, ... )
 {
 	ssize      res;
 	va_list va;
 	va_start( va, fmt );
-	res = str_fmt_out_err_va( fmt, va );
+	res = c_str_fmt_out_err_va( fmt, va );
 	va_end( va );
 	return res;
 }
@@ -1031,9 +1045,9 @@ u64 crc64( void const* data, ssize len )
 
 void* mem_copy( void* dest, void const* source, ssize n )
 {
-	if ( dest == NULL )
+	if ( dest == nullptr )
 	{
-		return NULL;
+		return nullptr;
 	}
 
 	return memcpy( dest, source, n );
@@ -1070,6 +1084,7 @@ void const* mem_find( void const* data, u8 c, ssize n )
 
 #define GEN_HEAP_STATS_MAGIC 0xDEADC0DE
 
+typedef struct _heap_stats _heap_stats;
 struct _heap_stats
 {
 	u32 magic;
@@ -1104,6 +1119,7 @@ void heap_stats_check( void )
 	GEN_ASSERT( _heap_stats_info.alloc_count == 0 );
 }
 
+typedef struct _heap_alloc_info _heap_alloc_info;
 struct _heap_alloc_info
 {
 	ssize    size;
@@ -1358,7 +1374,7 @@ ssize virtual_memory_page_size( ssize* alignment_out )
 
 #pragma endregion VirtualMemory
 
-void* Arena::allocator_proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags )
+void* arena_allocator_proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags )
 {
 	Arena* arena = rcast(Arena*, allocator_data);
 	void*      ptr   = NULL;
@@ -1370,7 +1386,7 @@ void* Arena::allocator_proc( void* allocator_data, AllocType type, ssize size, s
 		case EAllocation_ALLOC :
 			{
 				void* end        = pointer_add( arena->PhysicalStart, arena->TotalUsed );
-				ssize    total_size = align_forward_i64( size, alignment );
+				ssize total_size = align_forward_s64( size, alignment );
 
 				// NOTE: Out of memory
 				if ( arena->TotalUsed + total_size > (ssize) arena->TotalSize )
@@ -1408,7 +1424,7 @@ void* Arena::allocator_proc( void* allocator_data, AllocType type, ssize size, s
 	return ptr;
 }
 
-void* Pool::allocator_proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags )
+void* pool_allocator_proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags )
 {
 	Pool* pool = rcast( Pool*, allocator_data);
 	void* ptr  = NULL;
@@ -1481,7 +1497,7 @@ void* Pool::allocator_proc( void* allocator_data, AllocType type, ssize size, ss
 	return ptr;
 }
 
-Pool Pool::init_align( AllocatorInfo backing, ssize num_blocks, ssize block_size, ssize block_align )
+Pool pool_init_align( AllocatorInfo backing, ssize num_blocks, ssize block_size, ssize block_align )
 {
 	Pool pool = {};
 
@@ -1519,16 +1535,16 @@ Pool Pool::init_align( AllocatorInfo backing, ssize num_blocks, ssize block_size
 	return pool;
 }
 
-void Pool::clear()
+void pool_clear(Pool* pool)
 {
-	ssize    actual_block_size, block_index;
+	ssize actual_block_size, block_index;
 	void* curr;
 	uptr* end;
 
-	actual_block_size = BlockSize + BlockAlign;
+	actual_block_size = pool->BlockSize + pool->BlockAlign;
 
-	curr = PhysicalStart;
-	for ( block_index = 0; block_index < NumBlocks - 1; block_index++ )
+	curr = pool->PhysicalStart;
+	for ( block_index = 0; block_index < pool->NumBlocks - 1; block_index++ )
 	{
 		uptr* next = ( uptr* ) curr;
 		*next      = ( uptr  ) curr + actual_block_size;
@@ -1538,38 +1554,32 @@ void Pool::clear()
 	end  =  ( uptr* ) curr;
 	*end =  ( uptr )  NULL;
 
-	FreeList = PhysicalStart;
+	pool->FreeList = pool->PhysicalStart;
 }
 
 #pragma endregion Memory
 
-#pragma region String
+#pragma region StrBuilder
 
-String String::fmt( AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ... )
+StrBuilder strbuilder_make_length( AllocatorInfo allocator, char const* str, ssize length )
 {
-	va_list va;
-	va_start( va, fmt );
-	str_fmt_va( buf, buf_size, fmt, va );
-	va_end( va );
-
-	return make( allocator, buf );
-}
-
-String String::make_length( AllocatorInfo allocator, char const* str, ssize length )
-{
-	constexpr ssize header_size = sizeof( Header );
+	ssize const header_size = sizeof( StrBuilderHeader );
 
 	s32   alloc_size = header_size + length + 1;
 	void* allocation = alloc( allocator, alloc_size );
 
-	if ( allocation == nullptr )
-		return { nullptr };
+	if ( allocation == nullptr ) {
+		StrBuilder null_string = {nullptr};
+		return null_string;
+	}
 
-	Header&
-	header = * rcast(Header*, allocation);
-	header = { allocator, length, length };
+	StrBuilderHeader*
+	header = rcast(StrBuilderHeader*, allocation);
+	header->Allocator = allocator;
+	header->Capacity  = length;
+	header->Length    = length;
 
-	String  result = { rcast( char*, allocation) + header_size };
+	StrBuilder  result = { rcast( char*, allocation) + header_size };
 
 	if ( length && str )
 		mem_copy( result, str, length );
@@ -1581,93 +1591,30 @@ String String::make_length( AllocatorInfo allocator, char const* str, ssize leng
 	return result;
 }
 
-String String::make_reserve( AllocatorInfo allocator, ssize capacity )
+StrBuilder strbuilder_make_reserve( AllocatorInfo allocator, ssize capacity )
 {
-	constexpr ssize header_size = sizeof( Header );
+	ssize const header_size = sizeof( StrBuilderHeader );
 
 	s32   alloc_size = header_size + capacity + 1;
 	void* allocation = alloc( allocator, alloc_size );
 
-	if ( allocation == nullptr )
-		return { nullptr };
-
+	if ( allocation == nullptr ) {
+		StrBuilder null_string = {nullptr};
+		return null_string;
+	}
 	mem_set( allocation, 0, alloc_size );
 
-	Header*
-		header            = rcast(Header*, allocation);
+	StrBuilderHeader*
+	header            = rcast(StrBuilderHeader*, allocation);
 	header->Allocator = allocator;
 	header->Capacity  = capacity;
 	header->Length    = 0;
 
-	String result = { rcast(char*, allocation) + header_size };
+	StrBuilder result = { rcast(char*, allocation) + header_size };
 	return result;
 }
 
-String String::fmt_buf( AllocatorInfo allocator, char const* fmt, ... )
-{
-	local_persist thread_local
-	char buf[ GEN_PRINTF_MAXLEN ] = { 0 };
-
-	va_list va;
-	va_start( va, fmt );
-	str_fmt_va( buf, GEN_PRINTF_MAXLEN, fmt, va );
-	va_end( va );
-
-	return make( allocator, buf );
-}
-
-bool String::append_fmt( char const* fmt, ... )
-{
-	ssize   res;
-	char buf[ GEN_PRINTF_MAXLEN ] = { 0 };
-
-	va_list va;
-	va_start( va, fmt );
-	res = str_fmt_va( buf, count_of( buf ) - 1, fmt, va ) - 1;
-	va_end( va );
-
-	return append( buf, res );
-}
-
-bool String::make_space_for( char const* str, ssize add_len )
-{
-	ssize available = avail_space();
-
-	// NOTE: Return if there is enough space left
-	if ( available >= add_len )
-	{
-		return true;
-	}
-	else
-	{
-		ssize new_len, old_size, new_size;
-
-		void* ptr;
-		void* new_ptr;
-
-		AllocatorInfo allocator = get_header().Allocator;
-		Header*       header	= nullptr;
-
-		new_len  = grow_formula( length() + add_len );
-		ptr      = & get_header();
-		old_size = size_of( Header ) + length() + 1;
-		new_size = size_of( Header ) + new_len + 1;
-
-		new_ptr = resize( allocator, ptr, old_size, new_size );
-
-		if ( new_ptr == nullptr )
-			return false;
-
-		header            = rcast( Header*, new_ptr);
-		header->Allocator = allocator;
-		header->Capacity  = new_len;
-
-		Data = rcast( char*, header + 1 );
-
-		return true;
-	}
-}
-#pragma endregion String
+#pragma endregion StrBuilder
 
 #pragma region File Handling
 
@@ -1684,7 +1631,7 @@ wchar_t* _alloc_utf8_to_ucs2( AllocatorInfo a, char const* text, ssize* w_len_ )
 			*w_len_ = w_len;
 		return NULL;
 	}
-	len = str_len( text );
+	len = c_str_len( text );
 	if ( len == 0 )
 	{
 		if ( w_len_ )
@@ -1702,7 +1649,7 @@ wchar_t* _alloc_utf8_to_ucs2( AllocatorInfo a, char const* text, ssize* w_len_ )
 	w_len1 = MultiByteToWideChar( CP_UTF8, MB_ERR_INVALID_CHARS, text, scast( int, len), w_text, scast( int, w_len) );
 	if ( w_len1 == 0 )
 	{
-		free( a, w_text );
+		allocator_free( a, w_text );
 		if ( w_len_ )
 			*w_len_ = 0;
 		return NULL;
@@ -1811,7 +1758,7 @@ GEN_FILE_OPEN_PROC( _win32_file_open )
 	w_text = _alloc_utf8_to_ucs2( heap(), filename, NULL );
 	handle = CreateFileW( w_text, desired_access, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, creation_disposition, FILE_ATTRIBUTE_NORMAL, NULL );
 
-	free( heap(), w_text );
+	allocator_free( heap(), w_text );
 
 	if ( handle == INVALID_HANDLE_VALUE )
 	{
@@ -1950,7 +1897,7 @@ GEN_FILE_OPEN_PROC( _posix_file_open )
 
 internal void _dirinfo_free_entry( DirEntry* entry );
 
-// TODO : Is this a bad idea?
+// TODO(zpl) : Is this a bad idea?
 global b32      _std_file_set                     = false;
 global FileInfo _std_files[ EFileStandard_COUNT ] = {
 {
@@ -2006,7 +1953,7 @@ FileError file_close( FileInfo* f )
 		return EFileError_INVALID;
 
 	if ( f->filename )
-		free( heap(), ccast( char*, f->filename ));
+		allocator_free( heap(), ccast( char*, f->filename ));
 
 #if defined( GEN_SYSTEM_WINDOWS )
 	if ( f->fd.p == INVALID_HANDLE_VALUE )
@@ -2041,7 +1988,7 @@ FileError file_close( FileInfo* f )
 FileError file_new( FileInfo* f, FileDescriptor fd, FileOperations ops, char const* filename )
 {
 	FileError err = EFileError_NONE;
-	ssize        len = str_len( filename );
+	ssize        len = c_str_len( filename );
 
 	f->ops             = ops;
 	f->fd              = fd;
@@ -2125,6 +2072,7 @@ FileContents file_read_contents( AllocatorInfo a, b32 zero_terminate, char const
 	return result;
 }
 
+typedef struct _memory_fd _memory_fd;
 struct _memory_fd
 {
 	u8            magic;
@@ -2171,7 +2119,7 @@ b8 file_stream_new( FileInfo* file, AllocatorInfo allocator )
 	d->allocator = allocator;
 	d->flags     = EFileStream_CLONE_WRITABLE;
 	d->cap       = 0;
-	d->buf       = Array<u8>::init( allocator );
+	d->buf       = array_init( u8, allocator );
 
 	if ( ! d->buf )
 		return false;
@@ -2197,7 +2145,7 @@ b8 file_stream_open( FileInfo* file, AllocatorInfo allocator, u8* buffer, ssize
 	d->flags     = flags;
 	if ( d->flags & EFileStream_CLONE_WRITABLE )
 	{
-		Array<u8> arr = Array<u8>::init_reserve( allocator, size );
+		Array(u8) arr = array_init_reserve(u8, allocator, size );
 		d->buf = arr;
 
 		if ( ! d->buf )
@@ -2206,7 +2154,7 @@ b8 file_stream_open( FileInfo* file, AllocatorInfo allocator, u8* buffer, ssize
 		mem_copy( d->buf, buffer, size );
 		d->cap = size;
 
-		arr.get_header()->Num = size;
+		array_get_header(arr)->Num = size;
 	}
 	else
 	{
@@ -2274,11 +2222,11 @@ GEN_FILE_WRITE_AT_PROC( _memory_file_write )
 
 	if ( d->flags & EFileStream_CLONE_WRITABLE )
 	{
-		Array<u8> arr = { d->buf };
+		Array(u8) arr = { d->buf };
 
-		if ( arr.get_header()->Capacity < usize(new_cap) )
+		if ( array_get_header(arr)->Capacity < scast(usize, new_cap) )
 		{
-			if ( ! arr.grow( ( s64 )( new_cap ) ) )
+			if ( ! array_grow( & arr, ( s64 )( new_cap ) ) )
 				return false;
 			d->buf = arr;
 		}
@@ -2288,11 +2236,11 @@ GEN_FILE_WRITE_AT_PROC( _memory_file_write )
 
 	if ( ( d->flags & EFileStream_CLONE_WRITABLE ) && extralen > 0 )
 	{
-		Array<u8> arr = { d->buf };
+		Array(u8) arr = { d->buf };
 
 		mem_copy( d->buf + offset + rwlen, pointer_add_const( buffer, rwlen ), extralen );
 		d->cap = new_cap;
-		arr.get_header()->Capacity = new_cap;
+		array_get_header(arr)->Capacity = new_cap;
 	}
 	else
 	{
@@ -2312,11 +2260,11 @@ GEN_FILE_CLOSE_PROC( _memory_file_close )
 
 	if ( d->flags & EFileStream_CLONE_WRITABLE )
 	{
-		Array<u8> arr = { d->buf };
-		arr.free();
+		Array(u8) arr = { d->buf };
+		array_free(arr);
 	}
 
-	free( allocator, d );
+	allocator_free( allocator, d );
 }
 
 FileOperations const memory_file_operations = { _memory_file_read, _memory_file_write, _memory_file_seek, _memory_file_close };
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/gen.dep.hpp b/Project/Source/GasaEditor/GasaGen/gencpp/gen.dep.hpp
index 2df19af..b44ca0f 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/gen.dep.hpp
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/gen.dep.hpp
@@ -10,6 +10,9 @@
 #   pragma clang diagnostic ignored "-Wunknown-pragmas"
 #	pragma clang diagnostic ignored "-Wvarargs"
 #	pragma clang diagnostic ignored "-Wunused-function"
+#	pragma clang diagnostic ignored "-Wbraced-scalar-init"
+#   pragma clang diagnostic ignored "-W#pragma-messages"
+#	pragma clang diagnostic ignored "-Wstatic-in-inline"
 #endif
 
 #ifdef __GNUC__
@@ -47,12 +50,6 @@
 #	ifndef GEN_SYSTEM_MACOS
 #		define GEN_SYSTEM_MACOS 1
 #	endif
-#	include <TargetConditionals.h>
-#	if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
-#		ifndef GEN_SYSTEM_IOS
-#			define GEN_SYSTEM_IOS 1
-#		endif
-#	endif
 #elif defined( __unix__ )
 #	ifndef GEN_SYSTEM_UNIX
 #		define GEN_SYSTEM_UNIX 1
@@ -94,13 +91,21 @@
 /* Platform compiler */
 
 #if defined( _MSC_VER )
-#	define GEN_COMPILER_MSVC 1
+#	pragma message("Detected MSVC")
+// #	define GEN_COMPILER_CLANG 0
+#	define GEN_COMPILER_MSVC  1
+// #	define GEN_COMPILER_GCC   0
 #elif defined( __GNUC__ )
-#	define GEN_COMPILER_GCC 1
+#	pragma message("Detected GCC")
+// #	define GEN_COMPILER_CLANG 0
+// #	define GEN_COMPILER_MSVC  0
+#	define GEN_COMPILER_GCC   1
 #elif defined( __clang__ )
+#	pragma message("Detected CLANG")
 #	define GEN_COMPILER_CLANG 1
-#elif defined( __MINGW32__ )
-#	define GEN_COMPILER_MINGW 1
+// #	define GEN_COMPILER_MSVC  0
+// #	define GEN_COMPILER_GCC   0
+#else
 #	error Unknown compiler
 #endif
 
@@ -119,6 +124,26 @@
 #  define GEN_GCC_VERSION_CHECK(major,minor,patch) (0)
 #endif
 
+#if !defined(GEN_COMPILER_C)
+#	ifdef __cplusplus
+#		define GEN_COMPILER_C   0
+#		define GEN_COMPILER_CPP 1
+#	else
+#		if defined(__STDC__)
+#			define GEN_COMPILER_C   1
+#		    define GEN_COMPILER_CPP 0
+#		else
+            // Fallback for very old C compilers
+#			define GEN_COMPILER_C   1
+#		    define GEN_COMPILER_CPP 0
+#		endif
+#   endif
+#endif
+
+#if GEN_COMPILER_C
+#pragma message("GENCPP: Detected C")
+#endif
+
 #pragma endregion Platform Detection
 
 #pragma region Mandatory Includes
@@ -130,22 +155,55 @@
 #		include <intrin.h>
 #	endif
 
+#if GEN_COMPILER_C
+#include <assert.h>
+#include <stdbool.h>
+#endif
+
 #pragma endregion Mandatory Includes
 
-#ifdef GEN_DONT_USE_NAMESPACE
-#	define GEN_NS
-#	define GEN_NS_BEGIN
-#	define GEN_NS_END
+#if GEN_DONT_USE_NAMESPACE || GEN_COMPILER_C
+#	if GEN_COMPILER_C
+#		define GEN_NS
+#		define GEN_NS_BEGIN
+#		define GEN_NS_END
+#	else
+#		define GEN_NS              ::
+#		define GEN_NS_BEGIN
+#		define GEN_NS_END
+#	endif
 #else
-#	define GEN_NS       gen::
-#	define GEN_NS_BEGIN namespace gen {
-#	define GEN_NS_END   }
+#	define GEN_NS              gen::
+#	define GEN_NS_BEGIN        namespace gen {
+#	define GEN_NS_END          }
 #endif
 
 GEN_NS_BEGIN
 
 #pragma region Macros
 
+
+#if GEN_COMPILER_MSVC
+#ifdef GEN_DYN_LINK
+
+#ifdef GEN_DYN_EXPORT
+
+#define GEN_API __declspec( dllexport )
+#else
+#define GEN_API __declspec( dllimport )
+#endif
+#else
+#define GEN_API    // Empty for static builds
+#endif
+#else
+#ifdef GEN_DYN_LINK
+
+#define GEN_API __attribute__( ( visibility( "default" ) ) )
+#else
+#define GEN_API    // Empty for static builds
+#endif
+#endif
+
 #ifndef global
 #define global    // Global variables
 #endif
@@ -156,15 +214,27 @@ GEN_NS_BEGIN
 #define local_persist static    // Local Persisting variables
 #endif
 
-#ifndef api_c
-#define api_c extern "C"
-#endif
-
 #ifndef bit
-#define bit( Value )                           ( 1 << Value )
-#define bitfield_is_equal( Type, Field, Mask ) ( ( Type( Mask ) & Type( Field ) ) == Type( Mask ) )
+#define bit( Value )                         ( 1 << Value )
+#define bitfield_is_set( Type, Field, Mask ) ( ( scast( Type, Mask ) & scast( Type, Field ) ) == scast( Type, Mask ) )
 #endif
 
+// Mainly intended for forcing the base library to utilize only C-valid constructs or type coercion
+#ifndef GEN_C_LIKE_CPP
+#define GEN_C_LIKE_CPP 0
+#endif
+
+#if GEN_COMPILER_CPP
+#ifndef cast
+#define cast( type, value ) ( tmpl_cast<type>( value ) )
+#endif
+#else
+#ifndef cast
+#define cast( type, value ) ( (type)( value ) )
+#endif
+#endif
+
+#if GEN_COMPILER_CPP
 #ifndef ccast
 #define ccast( type, value ) ( const_cast<type>( ( value ) ) )
 #endif
@@ -177,6 +247,20 @@ GEN_NS_BEGIN
 #ifndef scast
 #define scast( type, value ) static_cast<type>( value )
 #endif
+#else
+#ifndef ccast
+#define ccast( type, value ) ( (type)( value ) )
+#endif
+#ifndef pcast
+#define pcast( type, value ) ( *(type*)( &value ) )
+#endif
+#ifndef rcast
+#define rcast( type, value ) ( (type)( value ) )
+#endif
+#ifndef scast
+#define scast( type, value ) ( (type)( value ) )
+#endif
+#endif
 
 #ifndef stringize
 #define stringize_va( ... ) #__VA_ARGS__
@@ -184,8 +268,12 @@ GEN_NS_BEGIN
 #endif
 
 #ifndef do_once
-#define do_once( statement ) for ( local_persist b32 once = true; once; once = false, ( statement ) )
-
+#define do_once()                                \
+	static int __do_once_counter_##__LINE__ = 0; \
+	for ( ; __do_once_counter_##__LINE__ != 1; __do_once_counter_##__LINE__ = 1 )
+#define do_once_defer( expression )              \
+	static int __do_once_counter_##__LINE__ = 0; \
+	for ( ; __do_once_counter_##__LINE__ != 1; __do_once_counter_##__LINE__ = 1, ( expression ) )
 #define do_once_start                    \
 	do                                   \
 	{                                    \
@@ -209,13 +297,19 @@ GEN_NS_BEGIN
 
 #ifndef compiler_decorated_func_name
 #ifdef COMPILER_CLANG
+
 #define compiler_decorated_func_name __PRETTY_NAME__
 #elif defined( COMPILER_MSVC )
+
 #define compiler_decorated_func_name __FUNCDNAME__
 #endif
 #endif
 
 #ifndef num_args_impl
+
+// This is essentially an arg couneter version of GEN_SELECT_ARG macros
+// See section : _Generic function overloading for that usage (explains this heavier case)
+
 #define num_args_impl( \
     _0,                \
     _1,                \
@@ -452,49 +546,165 @@ GEN_NS_BEGIN
 #define min( a, b ) ( ( a < b ) ? ( a ) : ( b ) )
 #endif
 
-#if defined( _MSC_VER ) || defined( GEN_COMPILER_TINYC )
+#if GEN_COMPILER_MSVC || GEN_COMPILER_TINYC
 #define offset_of( Type, element ) ( ( GEN_NS( ssize ) ) & ( ( (Type*)0 )->element ) )
 #else
 #define offset_of( Type, element ) __builtin_offsetof( Type, element )
 #endif
 
 #ifndef FORCEINLINE
-#ifdef GEN_COMPILER_MSVC
+#if GEN_COMPILER_MSVC
 #define FORCEINLINE __forceinline
 #define neverinline __declspec( noinline )
-#elif defined( GEN_COMPILER_GCC )
+#elif GEN_COMPILER_GCC
+
 #define FORCEINLINE inline __attribute__( ( __always_inline__ ) )
 #define neverinline __attribute__( ( __noinline__ ) )
-#elif defined( GEN_COMPILER_CLANG )
+#elif GEN_COMPILER_CLANG
+
 #if __has_attribute( __always_inline__ )
 #define FORCEINLINE inline __attribute__( ( __always_inline__ ) )
 #define neverinline __attribute__( ( __noinline__ ) )
 #else
 #define FORCEINLINE
+
 #define neverinline
+
 #endif
 #else
 #define FORCEINLINE
+
 #define neverinline
+
 #endif
 #endif
 
 #ifndef neverinline
-#ifdef GEN_COMPILER_MSVC
+#if GEN_COMPILER_MSVC
 #define neverinline __declspec( noinline )
-#elif defined( GEN_COMPILER_GCC )
+#elif GEN_COMPILER_GCC
+
 #define neverinline __attribute__( ( __noinline__ ) )
-#elif defined( GEN_COMPILER_CLANG )
+#elif GEN_COMPILER_CLANG
+
 #if __has_attribute( __always_inline__ )
 #define neverinline __attribute__( ( __noinline__ ) )
 #else
 #define neverinline
+
 #endif
 #else
 #define neverinline
+
 #endif
 #endif
 
+#if GEN_COMPILER_C
+#ifndef static_assert
+#undef static_assert
+#if GEN_COMPILER_C && __STDC_VERSION__ >= 201112L
+#define static_assert( condition, message ) _Static_assert( condition, message )
+#else
+#define static_assert( condition, message ) typedef char static_assertion_##__LINE__[( condition ) ? 1 : -1]
+#endif
+#endif
+#endif
+
+#if GEN_COMPILER_CPP
+// Already Defined
+#elif GEN_COMPILER_C && __STDC_VERSION__ >= 201112L
+
+#define thread_local _Thread_local
+#elif GEN_COMPILER_MSVC
+
+#define thread_local __declspec( thread )
+#elif GEN_COMPILER_CLANG
+
+#define thread_local __thread
+#else
+#error "No thread local support"
+#endif
+
+#if ! defined( typeof ) && ( ! GEN_COMPILER_C || __STDC_VERSION__ < 202311L )
+#if ! GEN_COMPILER_C
+#define typeof decltype
+#elif defined( _MSC_VER )
+
+#define typeof __typeof__
+#elif defined( __GNUC__ ) || defined( __clang__ )
+
+#define typeof __typeof__
+#else
+#error "Compiler not supported"
+#endif
+#endif
+
+#ifndef GEN_API_C_BEGIN
+#if GEN_COMPILER_C
+#define GEN_API_C_BEGIN
+
+#define GEN_API_C_END
+
+#else
+#define GEN_API_C_BEGIN \
+	extern "C"          \
+	{
+#define GEN_API_C_END }
+#endif
+#endif
+
+#if GEN_COMPILER_C
+#if __STDC_VERSION__ >= 202311L
+#define enum_underlying( type ) : type
+#else
+#define enum_underlying( type )
+
+#endif
+#else
+#define enum_underlying( type ) : type
+#endif
+
+#if GEN_COMPILER_C
+#ifndef nullptr
+#define nullptr NULL
+#endif
+
+#ifndef GEN_REMOVE_PTR
+#define GEN_REMOVE_PTR( type ) typeof( *( (type)NULL ) )
+#endif
+#endif
+
+#if ! defined( GEN_PARAM_DEFAULT ) && GEN_COMPILER_CPP
+#define GEN_PARAM_DEFAULT = {}
+#else
+#define GEN_PARAM_DEFAULT
+
+#endif
+
+#if GEN_COMPILER_CPP
+#define struct_init( type, value ) \
+	{                              \
+		value                      \
+	}
+#else
+#define struct_init( type, value ) \
+	{                              \
+		value                      \
+	}
+#endif
+
+#if 0
+#ifndef GEN_OPTIMIZE_MAPPINGS_BEGIN
+#define GEN_OPTIMIZE_MAPPINGS_BEGIN _pragma( optimize( "gt", on ) )
+#define GEN_OPITMIZE_MAPPINGS_END   _pragma( optimize( "", on ) )
+#endif
+#else
+#define GEN_OPTIMIZE_MAPPINGS_BEGIN
+
+#define GEN_OPITMIZE_MAPPINGS_END
+
+#endif
+
 #pragma endregion Macros
 
 #pragma region Basic Types
@@ -616,41 +826,56 @@ typedef s8  b8;
 typedef s16 b16;
 typedef s32 b32;
 
-using mem_ptr       = void*;
-using mem_ptr_const = void const*;
+typedef void*       mem_ptr;
+typedef void const* mem_ptr_const ;
 
+#if GEN_COMPILER_CPP
 template<typename Type> uptr to_uptr( Type* ptr ) { return (uptr)ptr; }
 template<typename Type> sptr to_sptr( Type* ptr ) { return (sptr)ptr; }
 
 template<typename Type> mem_ptr       to_mem_ptr      ( Type ptr ) { return (mem_ptr)      ptr; }
 template<typename Type> mem_ptr_const to_mem_ptr_const( Type ptr ) { return (mem_ptr_const)ptr; }
+#else
+#define to_uptr( ptr ) ((uptr)(ptr))
+#define to_sptr( ptr ) ((sptr)(ptr))
+
+#define to_mem_ptr( ptr)       ((mem_ptr)ptr)
+#define to_mem_ptr_const( ptr) ((mem_ptr)ptr)
+#endif
 
 #pragma endregion Basic Types
 
 #pragma region Debug
 
-#if defined( _MSC_VER )
-#	if _MSC_VER < 1300
-#		define GEN_DEBUG_TRAP() __asm int 3 /* Trap to debugger! */
+#if GEN_BUILD_DEBUG
+#	if defined( GEN_COMPILER_MSVC )
+#		if _MSC_VER < 1300
+#pragma message("GEN_BUILD_DEBUG: __asm int 3")
+#			define GEN_DEBUG_TRAP() __asm int 3 /* Trap to debugger! */
+#		else
+#pragma message("GEN_BUILD_DEBUG: __debugbreak()")
+#			define GEN_DEBUG_TRAP() __debugbreak()
+#		endif
+#	elif defined( GEN_COMPILER_TINYC )
+#		define GEN_DEBUG_TRAP() process_exit( 1 )
 #	else
-#		define GEN_DEBUG_TRAP() __debugbreak()
+#		define GEN_DEBUG_TRAP() __builtin_trap()
 #	endif
-#elif defined( GEN_COMPILER_TINYC )
-#	define GEN_DEBUG_TRAP() process_exit( 1 )
 #else
-#	define GEN_DEBUG_TRAP() __builtin_trap()
+#pragma message("GEN_BUILD_DEBUG: omitted")
+#	define GEN_DEBUG_TRAP()
 #endif
 
 #define GEN_ASSERT( cond ) GEN_ASSERT_MSG( cond, NULL )
 
-#define GEN_ASSERT_MSG( cond, msg, ... )                                                     \
-	do                                                                                       \
-	{                                                                                        \
-		if ( ! ( cond ) )                                                                    \
-		{                                                                                    \
-			assert_handler( #cond, __FILE__, scast( s64, __LINE__ ), msg, ##__VA_ARGS__ ); \
-			GEN_DEBUG_TRAP();                                                                \
-		}                                                                                    \
+#define GEN_ASSERT_MSG( cond, msg, ... )                                                              \
+	do                                                                                                \
+	{                                                                                                 \
+		if ( ! ( cond ) )                                                                             \
+		{                                                                                             \
+			assert_handler( #cond, __FILE__, __func__, scast( s64, __LINE__ ), msg, ##__VA_ARGS__ );  \
+			GEN_DEBUG_TRAP();                                                                         \
+		}                                                                                             \
 	} while ( 0 )
 
 #define GEN_ASSERT_NOT_NULL( ptr ) GEN_ASSERT_MSG( ( ptr ) != NULL, #ptr " must not be NULL" )
@@ -658,14 +883,14 @@ template<typename Type> mem_ptr_const to_mem_ptr_const( Type ptr ) { return (mem
 // NOTE: Things that shouldn't happen with a message!
 #define GEN_PANIC( msg, ... ) GEN_ASSERT_MSG( 0, msg, ##__VA_ARGS__ )
 
-#if Build_Debug
+#if GEN_BULD_DEBUG
 	#define GEN_FATAL( ... )                               \
 	do                                                     \
 	{                                                      \
 		local_persist thread_local                         \
 		char buf[GEN_PRINTF_MAXLEN] = { 0 };               \
 		                                                   \
-		str_fmt(buf, GEN_PRINTF_MAXLEN, __VA_ARGS__);      \
+		c_str_fmt(buf, GEN_PRINTF_MAXLEN, __VA_ARGS__);    \
 		GEN_PANIC(buf);                                    \
 	}                                                      \
 	while (0)
@@ -674,13 +899,14 @@ template<typename Type> mem_ptr_const to_mem_ptr_const( Type ptr ) { return (mem
 #	define GEN_FATAL( ... )                  \
 	do                                       \
 	{                                        \
-		str_fmt_out_err( __VA_ARGS__ );      \
+		c_str_fmt_out_err( __VA_ARGS__ );    \
+		GEN_DEBUG_TRAP();                    \
 		process_exit(1);                     \
 	}                                        \
 	while (0)
 #endif
 
-void assert_handler( char const* condition, char const* file, s32 line, char const* msg, ... );
+void assert_handler( char const* condition, char const* file, char const* function, s32 line, char const* msg, ... );
 s32  assert_crash( char const* condition );
 void process_exit( u32 code );
 
@@ -688,7 +914,7 @@ void process_exit( u32 code );
 
 #pragma region Memory
 
-#define kilobytes( x ) ( ( x ) * ( s64 )( 1024 ) )
+#define kilobytes( x ) (          ( x ) * ( s64 )( 1024 ) )
 #define megabytes( x ) ( kilobytes( x ) * ( s64 )( 1024 ) )
 #define gigabytes( x ) ( megabytes( x ) * ( s64 )( 1024 ) )
 #define terabytes( x ) ( gigabytes( x ) * ( s64 )( 1024 ) )
@@ -712,7 +938,7 @@ b32 is_power_of_two( ssize x );
 void* align_forward( void* ptr, ssize alignment );
 
 //! Aligns value to a specified alignment.
-s64 align_forward_i64( s64 value, ssize alignment );
+s64 align_forward_by_value( s64 value, ssize alignment );
 
 //! Moves pointer forward by bytes.
 void* pointer_add( void* ptr, ssize bytes );
@@ -753,10 +979,7 @@ enum AllocType : u8
 	EAllocation_RESIZE,
 };
 
-using AllocatorProc = void* ( void* allocator_data, AllocType type
-	, ssize size, ssize alignment
-	, void* old_memory, ssize old_size
-	, u64 flags );
+typedef void*(AllocatorProc)( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags );
 
 struct AllocatorInfo
 {
@@ -784,7 +1007,7 @@ void* alloc( AllocatorInfo a, ssize size );
 void* alloc_align( AllocatorInfo a, ssize size, ssize alignment );
 
 //! Free allocated memory.
-void free( AllocatorInfo a, void* ptr );
+void allocator_free( AllocatorInfo a, void* ptr );
 
 //! Free all memory allocated by an allocator.
 void free_all( AllocatorInfo a );
@@ -818,7 +1041,7 @@ void* default_resize_align( AllocatorInfo a, void* ptr, ssize old_size, ssize ne
 void* heap_allocator_proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags );
 
 //! The heap allocator backed by operating system's memory manager.
-constexpr AllocatorInfo heap( void ) { return { heap_allocator_proc, nullptr }; }
+constexpr AllocatorInfo heap( void ) { AllocatorInfo allocator = { heap_allocator_proc, nullptr }; return allocator; }
 
 //! Helper to allocate memory using heap allocator.
 #define malloc( sz ) alloc( heap(), sz )
@@ -848,163 +1071,243 @@ b32 vm_free( VirtualMemory vm );
 VirtualMemory vm_trim( VirtualMemory vm, ssize lead_size, ssize size );
 
 //! Purge virtual memory.
-b32 gen_vm_purge( VirtualMemory vm );
+b32 vm_purge( VirtualMemory vm );
 
 //! Retrieve VM's page size and alignment.
-ssize gen_virtual_memory_page_size( ssize* alignment_out );
+ssize virtual_memory_page_size( ssize* alignment_out );
+
+#pragma region Arena
+struct Arena;
+
+AllocatorInfo arena_allocator_info( Arena* arena );
+
+// Remove static keyword and rename allocator_proc
+void* arena_allocator_proc(void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags);
+
+// Add these declarations after the Arena struct
+Arena arena_init_from_allocator(AllocatorInfo backing, ssize size);
+Arena arena_init_from_memory   ( void* start, ssize size );
+
+Arena arena_init_sub      (Arena* parent, ssize size);
+ssize arena_alignment_of  (Arena* arena, ssize alignment);
+void  arena_check         (Arena* arena);
+void  arena_free          (Arena* arena);
+ssize arena_size_remaining(Arena* arena, ssize alignment);
 
 struct Arena
 {
-	static
-	void* allocator_proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags );
+	AllocatorInfo Backing;
+	void*         PhysicalStart;
+	ssize         TotalSize;
+	ssize         TotalUsed;
+	ssize         TempCount;
 
-	static
-	Arena init_from_memory( void* start, ssize size )
-	{
-		return
-		{
-			{ nullptr, nullptr },
-			start,
-			size,
-			0,
-			0
-		};
-	}
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+#pragma region Member Mapping
+	FORCEINLINE operator AllocatorInfo() { return arena_allocator_info(this); }
 
-	static
-	Arena init_from_allocator( AllocatorInfo backing, ssize size )
-	{
-		Arena result =
-		{
-		backing,
-		alloc( backing, size),
-		size,
-		0,
-		0
-		};
-		return result;
-	}
-
-	static
-	Arena init_sub( Arena& parent, ssize size )
-	{
-		return init_from_allocator( parent.Backing, size );
-	}
-
-	ssize alignment_of( ssize alignment )
-	{
-		ssize alignment_offset, result_pointer, mask;
-		GEN_ASSERT( is_power_of_two( alignment ) );
-
-		alignment_offset = 0;
-		result_pointer   = (ssize) PhysicalStart + TotalUsed;
-		mask             = alignment - 1;
-
-		if ( result_pointer & mask )
-			alignment_offset = alignment - ( result_pointer & mask );
-
-		return alignment_offset;
-	}
+	FORCEINLINE static void* allocator_proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags ) { return arena_allocator_proc( allocator_data, type, size, alignment, old_memory, old_size, flags ); }
+	FORCEINLINE static Arena init_from_memory( void* start, ssize size )                                                                                      { return arena_init_from_memory( start, size ); }
+	FORCEINLINE static Arena init_from_allocator( AllocatorInfo backing, ssize size )                                                                         { return arena_init_from_allocator( backing, size ); }
+	FORCEINLINE static Arena init_sub( Arena& parent, ssize size )                                                                                            { return arena_init_from_allocator( parent.Backing, size ); }
+	FORCEINLINE        ssize alignment_of( ssize alignment )                                                                                                  { return arena_alignment_of(this, alignment); }
+	FORCEINLINE        void  free()                                                                                                                           { return arena_free(this);  }
+	FORCEINLINE        ssize size_remaining( ssize alignment )                                                                                                { return arena_size_remaining(this, alignment); }
 
 // This id is defined by Unreal for asserts
 #pragma push_macro("check")
 #undef check
-	void check()
-	{
-		GEN_ASSERT( TempCount == 0 );
-	}
+	FORCEINLINE void check() { arena_check(this); }
 #pragma pop_macro("check")
 
-	void free()
-	{
-		if ( Backing.Proc )
-		{
-			gen::free( Backing, PhysicalStart );
-			PhysicalStart = nullptr;
-		}
-	}
-
-	ssize size_remaining( ssize alignment )
-	{
-		ssize result = TotalSize - ( TotalUsed + alignment_of( alignment ) );
-		return result;
-	}
-
-	AllocatorInfo Backing;
-	void*         PhysicalStart;
-	ssize            TotalSize;
-	ssize            TotalUsed;
-	ssize            TempCount;
-
-	operator AllocatorInfo()
-	{
-		return { allocator_proc, this };
-	}
+#pragma endregion Member Mapping
+#endif
 };
 
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+FORCEINLINE AllocatorInfo allocator_info(Arena& arena )                 { return arena_allocator_info(& arena); }
+FORCEINLINE Arena         init_sub      (Arena& parent, ssize size)     { return arena_init_sub( & parent, size); }
+FORCEINLINE ssize         alignment_of  (Arena& arena, ssize alignment) { return arena_alignment_of( & arena, alignment); }
+FORCEINLINE void          free          (Arena& arena)                  { return arena_free(& arena); }
+FORCEINLINE ssize         size_remaining(Arena& arena, ssize alignment) { return arena_size_remaining(& arena, alignment); }
+
+// This id is defined by Unreal for asserts
+#pragma push_macro("check")
+#undef check
+FORCEINLINE void check(Arena& arena) { return arena_check(& arena); }
+#pragma pop_macro("check")
+#endif
+
+
+inline
+AllocatorInfo arena_allocator_info( Arena* arena ) {
+	GEN_ASSERT(arena != nullptr);
+	AllocatorInfo info = { arena_allocator_proc, arena };
+	return info;
+}
+
+inline
+Arena arena_init_from_memory( void* start, ssize size )
+{
+	Arena arena = {
+		{ nullptr, nullptr },
+		start,
+		size,
+		0,
+		0
+	};
+	return arena;
+}
+
+inline
+Arena arena_init_from_allocator(AllocatorInfo backing, ssize size) {
+	Arena result = {
+		backing,
+		alloc(backing, size),
+		size,
+		0,
+		0
+	};
+	return result;
+}
+
+inline
+Arena arena_init_sub(Arena* parent, ssize size) {
+	GEN_ASSERT(parent != nullptr);
+	return arena_init_from_allocator(parent->Backing, size);
+}
+
+inline
+ssize arena_alignment_of(Arena* arena, ssize alignment)
+{
+	GEN_ASSERT(arena != nullptr);
+	ssize alignment_offset, result_pointer, mask;
+	GEN_ASSERT(is_power_of_two(alignment));
+
+	alignment_offset = 0;
+	result_pointer  = (ssize)arena->PhysicalStart + arena->TotalUsed;
+	mask            = alignment - 1;
+
+	if (result_pointer & mask)
+	alignment_offset = alignment - (result_pointer & mask);
+
+	return alignment_offset;
+}
+
+inline
+void arena_check(Arena* arena)
+{
+    GEN_ASSERT(arena != nullptr );
+    GEN_ASSERT(arena->TempCount == 0);
+}
+
+inline
+void arena_free(Arena* arena)
+{
+	GEN_ASSERT(arena != nullptr);
+	if (arena->Backing.Proc)
+	{
+		allocator_free(arena->Backing, arena->PhysicalStart);
+		arena->PhysicalStart = nullptr;
+	}
+}
+
+inline
+ssize arena_size_remaining(Arena* arena, ssize alignment)
+{
+	GEN_ASSERT(arena != nullptr);
+	ssize result = arena->TotalSize - (arena->TotalUsed + arena_alignment_of(arena, alignment));
+	return result;
+}
+#pragma endregion Arena
+
+#pragma region FixedArena
+template<s32 Size>
+struct FixedArena;
+
+template<s32 Size> FixedArena<Size> fixed_arena_init();
+template<s32 Size> AllocatorInfo    fixed_arena_allocator_info(FixedArena<Size>* fixed_arena );
+template<s32 Size> ssize            fixed_arena_size_remaining(FixedArena<Size>* fixed_arena, ssize alignment);
+template<s32 Size> void             fixed_arena_free(FixedArena<Size>* fixed_arena);
+
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+template<s32 Size> AllocatorInfo    allocator_info( FixedArena<Size>& fixed_arena )                { return allocator_info(& fixed_arena); }
+template<s32 Size> ssize            size_remaining(FixedArena<Size>& fixed_arena, ssize alignment) { return size_remaining( & fixed_arena, alignment); }
+#endif
+
 // Just a wrapper around using an arena with memory associated with its scope instead of from an allocator.
 // Used for static segment or stack allocations.
 template< s32 Size >
 struct FixedArena
 {
-	static
-	FixedArena init()
-	{
-		FixedArena result = { Arena::init_from_memory( result.memory, Size ), {0} };
-		return result;
-	}
-
-	ssize size_remaining( ssize alignment )
-	{
-		return arena.size_remaining( alignment );
-	}
-
-	operator AllocatorInfo()
-	{
-		return { Arena::allocator_proc, &arena };
-	}
-
+	char  memory[Size];
 	Arena arena;
-	char  memory[ Size ];
+
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+#pragma region Member Mapping
+	FORCEINLINE operator AllocatorInfo() { return fixed_arena_allocator_info(this); }
+
+	FORCEINLINE static FixedArena init()                          { FixedArena result; fixed_arena_init<Size>(result); return result; }
+	FORCEINLINE ssize             size_remaining(ssize alignment) { fixed_arena_size_remaining(this, alignment); }
+#pragma endregion Member Mapping
+#endif
 };
 
-using Arena_1KB   = FixedArena< kilobytes( 1 ) >;
-using Arena_4KB   = FixedArena< kilobytes( 4 ) >;
-using Arena_8KB   = FixedArena< kilobytes( 8 ) >;
-using Arena_16KB  = FixedArena< kilobytes( 16 ) >;
-using Arena_32KB  = FixedArena< kilobytes( 32 ) >;
-using Arena_64KB  = FixedArena< kilobytes( 64 ) >;
-using Arena_128KB = FixedArena< kilobytes( 128 ) >;
-using Arena_256KB = FixedArena< kilobytes( 256 ) >;
-using Arena_512KB = FixedArena< kilobytes( 512 ) >;
-using Arena_1MB   = FixedArena< megabytes( 1 ) >;
-using Arena_2MB   = FixedArena< megabytes( 2 ) >;
-using Arena_4MB   = FixedArena< megabytes( 4 ) >;
+template<s32 Size> inline
+AllocatorInfo fixed_arena_allocator_info( FixedArena<Size>* fixed_arena ) {
+	GEN_ASSERT(fixed_arena);
+	return { arena_allocator_proc, & fixed_arena->arena };
+}
+
+template<s32 Size> inline
+void fixed_arena_init(FixedArena<Size>* result) {
+    zero_size(& result->memory[0], Size);
+    result->arena = arena_init_from_memory(& result->memory[0], Size);
+}
+
+template<s32 Size> inline
+void fixed_arena_free(FixedArena<Size>* fixed_arena) {
+	arena_free( & fixed_arena->arena);
+}
+
+template<s32 Size> inline
+ssize fixed_arena_size_remaining(FixedArena<Size>* fixed_arena, ssize alignment) {
+    return size_remaining(fixed_arena->arena, alignment);
+}
+
+using FixedArena_1KB   = FixedArena< kilobytes( 1 ) >;
+using FixedArena_4KB   = FixedArena< kilobytes( 4 ) >;
+using FixedArena_8KB   = FixedArena< kilobytes( 8 ) >;
+using FixedArena_16KB  = FixedArena< kilobytes( 16 ) >;
+using FixedArena_32KB  = FixedArena< kilobytes( 32 ) >;
+using FixedArena_64KB  = FixedArena< kilobytes( 64 ) >;
+using FixedArena_128KB = FixedArena< kilobytes( 128 ) >;
+using FixedArena_256KB = FixedArena< kilobytes( 256 ) >;
+using FixedArena_512KB = FixedArena< kilobytes( 512 ) >;
+using FixedArena_1MB   = FixedArena< megabytes( 1 ) >;
+using FixedArena_2MB   = FixedArena< megabytes( 2 ) >;
+using FixedArena_4MB   = FixedArena< megabytes( 4 ) >;
+#pragma endregion FixedArena
+
+#pragma region Pool
+struct Pool;
+
+void* pool_allocator_proc(void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags);
+
+Pool          pool_init(AllocatorInfo backing, ssize num_blocks, ssize block_size);
+Pool          pool_init_align(AllocatorInfo backing, ssize num_blocks, ssize block_size, ssize block_align);
+AllocatorInfo pool_allocator_info(Pool* pool);
+void          pool_clear(Pool* pool);
+void          pool_free(Pool* pool);
+
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+AllocatorInfo allocator_info(Pool& pool) { return pool_allocator_info(& pool); }
+void          clear(Pool& pool)          { return pool_clear(& pool); }
+void          free(Pool& pool)           { return pool_free(& pool); }
+#endif
 
 struct Pool
 {
-	static
-	void* allocator_proc( void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags );
-
-	static
-	Pool init( AllocatorInfo backing, ssize num_blocks, ssize block_size )
-	{
-		return init_align( backing, num_blocks, block_size, GEN_DEFAULT_MEMORY_ALIGNMENT );
-	}
-
-	static
-	Pool init_align( AllocatorInfo backing, ssize num_blocks, ssize block_size, ssize block_align );
-
-	void clear();
-
-	void free()
-	{
-		if ( Backing.Proc )
-		{
-			gen::free( Backing, PhysicalStart );
-		}
-	}
-
 	AllocatorInfo Backing;
 	void*         PhysicalStart;
 	void*         FreeList;
@@ -1013,12 +1316,37 @@ struct Pool
 	ssize         TotalSize;
 	ssize         NumBlocks;
 
-	operator AllocatorInfo()
-	{
-		return { allocator_proc, this };
-	}
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+#pragma region Member Mapping
+    FORCEINLINE operator AllocatorInfo() { return pool_allocator_info(this); }
+
+    FORCEINLINE static void* allocator_proc(void* allocator_data, AllocType type, ssize size, ssize alignment, void* old_memory, ssize old_size, u64 flags) { return pool_allocator_proc(allocator_data, type, size, alignment, old_memory, old_size, flags); }
+    FORCEINLINE static Pool  init(AllocatorInfo backing, ssize num_blocks, ssize block_size)                                                                { return pool_init(backing, num_blocks, block_size); }
+    FORCEINLINE static Pool  init_align(AllocatorInfo backing, ssize num_blocks, ssize block_size, ssize block_align)                                       { return pool_init_align(backing, num_blocks, block_size, block_align); }
+    FORCEINLINE        void  clear() { pool_clear( this); }
+    FORCEINLINE        void  free()  { pool_free( this); }
+#pragma endregion
+#endif
 };
 
+inline
+AllocatorInfo pool_allocator_info(Pool* pool) {
+	AllocatorInfo info = { pool_allocator_proc, pool };
+	return info;
+}
+
+inline
+Pool pool_init(AllocatorInfo backing, ssize num_blocks, ssize block_size) {
+	return pool_init_align(backing, num_blocks, block_size, GEN_DEFAULT_MEMORY_ALIGNMENT);
+}
+
+inline
+void pool_free(Pool* pool) {
+	if(pool->Backing.Proc) {
+		allocator_free(pool->Backing, pool->PhysicalStart);
+	}
+}
+#pragma endregion Pool
 
 inline
 b32 is_power_of_two( ssize x ) {
@@ -1037,9 +1365,9 @@ mem_ptr align_forward( void* ptr, ssize alignment )
 	return to_mem_ptr(forward);
 }
 
-inline s64 align_forward_i64( s64 value, ssize alignment ) { return value + ( alignment - value % alignment ) % alignment; }
+inline s64 align_forward_s64( s64 value, ssize alignment ) { return value + ( alignment - value % alignment ) % alignment; }
 
-inline void*       pointer_add      ( void*       ptr, ssize bytes ) { return rcast(void*,       rcast( u8*,        ptr) + bytes ); }
+inline void*       pointer_add      ( void*       ptr, ssize bytes ) { return rcast(void*,         rcast( u8*,        ptr) + bytes ); }
 inline void const* pointer_add_const( void const* ptr, ssize bytes ) { return rcast(void const*, rcast( u8 const*,  ptr) + bytes ); }
 
 inline sptr pointer_diff( mem_ptr_const begin, mem_ptr_const end ) {
@@ -1195,7 +1523,7 @@ void* alloc( AllocatorInfo a, ssize size ) {
 }
 
 inline
-void free( AllocatorInfo a, void* ptr ) {
+void allocator_free( AllocatorInfo a, void* ptr ) {
 	if ( ptr != nullptr )
 		a.Proc( a.Data, EAllocation_FREE, 0, 0, ptr, 0, GEN_DEFAULT_ALLOCATOR_FLAGS );
 }
@@ -1223,7 +1551,7 @@ void* default_resize_align( AllocatorInfo a, void* old_memory, ssize old_size, s
 
 	if ( new_size == 0 )
 	{
-		free( a, old_memory );
+		allocator_free( a, old_memory );
 		return nullptr;
 	}
 
@@ -1241,7 +1569,7 @@ void* default_resize_align( AllocatorInfo a, void* old_memory, ssize old_size, s
 			return nullptr;
 
 		mem_move( new_memory, old_memory, min( new_size, old_size ) );
-		free( a, old_memory );
+		allocator_free( a, old_memory );
 		return new_memory;
 	}
 }
@@ -1256,7 +1584,6 @@ void zero_size( void* ptr, ssize size ) {
 #pragma region String Ops
 
 const char* char_first_occurence( const char* str, char c );
-constexpr auto str_find = &char_first_occurence;
 
 b32   char_is_alpha( char c );
 b32   char_is_alphanumeric( char c );
@@ -1269,25 +1596,25 @@ char  char_to_upper( char c );
 s32  digit_to_int( char c );
 s32  hex_digit_to_int( char c );
 
-s32         str_compare( const char* s1, const char* s2 );
-s32         str_compare( const char* s1, const char* s2, ssize len );
-char*       str_copy( char* dest, const char* source, ssize len );
-ssize       str_copy_nulpad( char* dest, const char* source, ssize len );
-ssize       str_len( const char* str );
-ssize       str_len( const char* str, ssize max_len );
-char*       str_reverse( char* str );    // NOTE: ASCII only
-char const* str_skip( char const* str, char c );
-char const* str_skip_any( char const* str, char const* char_list );
-char const* str_trim( char const* str, b32 catch_newline );
+s32         c_str_compare( const char* s1, const char* s2 );
+s32         c_str_compare_len( const char* s1, const char* s2, ssize len );
+char*       c_str_copy( char* dest, const char* source, ssize len );
+ssize       c_str_copy_nulpad( char* dest, const char* source, ssize len );
+ssize       c_str_len( const char* str );
+ssize       c_str_len_capped( const char* str, ssize max_len );
+char*       c_str_reverse( char* str );    // NOTE: ASCII only
+char const* c_str_skip( char const* str, char c );
+char const* c_str_skip_any( char const* str, char const* char_list );
+char const* c_str_trim( char const* str, b32 catch_newline );
 
 // NOTE: ASCII only
-void str_to_lower( char* str );
-void str_to_upper( char* str );
+void c_str_to_lower( char* str );
+void c_str_to_upper( char* str );
 
-s64  str_to_i64( const char* str, char** end_ptr, s32 base );
+s64  c_str_to_i64( const char* str, char** end_ptr, s32 base );
 void i64_to_str( s64 value, char* string, s32 base );
 void u64_to_str( u64 value, char* string, s32 base );
-f64  str_to_f64( const char* str, char** end_ptr );
+f64  c_str_to_f64( const char* str, char** end_ptr );
 
 inline
 const char* char_first_occurence( const char* s, char c )
@@ -1373,7 +1700,7 @@ s32 hex_digit_to_int( char c )
 }
 
 inline
-s32 str_compare( const char* s1, const char* s2 )
+s32 c_str_compare( const char* s1, const char* s2 )
 {
 	while ( *s1 && ( *s1 == *s2 ) )
 	{
@@ -1383,7 +1710,7 @@ s32 str_compare( const char* s1, const char* s2 )
 }
 
 inline
-s32 str_compare( const char* s1, const char* s2, ssize len )
+s32 c_str_compare_len( const char* s1, const char* s2, ssize len )
 {
 	for ( ; len > 0; s1++, s2++, len-- )
 	{
@@ -1396,7 +1723,7 @@ s32 str_compare( const char* s1, const char* s2, ssize len )
 }
 
 inline
-char* str_copy( char* dest, const char* source, ssize len )
+char* c_str_copy( char* dest, const char* source, ssize len )
 {
 	GEN_ASSERT_NOT_NULL( dest );
 	if ( source )
@@ -1417,7 +1744,7 @@ char* str_copy( char* dest, const char* source, ssize len )
 }
 
 inline
-ssize str_copy_nulpad( char* dest, const char* source, ssize len )
+ssize c_str_copy_nulpad( char* dest, const char* source, ssize len )
 {
 	ssize result = 0;
 	GEN_ASSERT_NOT_NULL( dest );
@@ -1442,7 +1769,7 @@ ssize str_copy_nulpad( char* dest, const char* source, ssize len )
 }
 
 inline
-ssize str_len( const char* str )
+ssize c_str_len( const char* str )
 {
 	if ( str == NULL )
 	{
@@ -1455,7 +1782,7 @@ ssize str_len( const char* str )
 }
 
 inline
-ssize str_len( const char* str, ssize max_len )
+ssize c_str_len_capped( const char* str, ssize max_len )
 {
 	const char* end = rcast(const char*, mem_find( str, 0, max_len ));
 	if ( end )
@@ -1464,9 +1791,9 @@ ssize str_len( const char* str, ssize max_len )
 }
 
 inline
-char* str_reverse( char* str )
+char* c_str_reverse( char* str )
 {
-	ssize    len  = str_len( str );
+	ssize    len  = c_str_len( str );
 	char* a    = str + 0;
 	char* b    = str + len - 1;
 	len       /= 2;
@@ -1479,7 +1806,7 @@ char* str_reverse( char* str )
 }
 
 inline
-char const* str_skip( char const* str, char c )
+char const* c_str_skip( char const* str, char c )
 {
 	while ( *str && *str != c )
 	{
@@ -1489,20 +1816,20 @@ char const* str_skip( char const* str, char c )
 }
 
 inline
-char const* str_skip_any( char const* str, char const* char_list )
+char const* c_str_skip_any( char const* str, char const* char_list )
 {
-	char const* closest_ptr     = rcast( char const*, pointer_add_const( rcast(void const*, str), str_len( str ) ));
-	ssize       char_list_count = str_len( char_list );
+	char const* closest_ptr     = rcast( char const*, pointer_add_const( rcast(mem_ptr_const, str), c_str_len( str ) ));
+	ssize       char_list_count = c_str_len( char_list );
 	for ( ssize i = 0; i < char_list_count; i++ )
 	{
-		char const* p = str_skip( str, char_list[ i ] );
+		char const* p = c_str_skip( str, char_list[ i ] );
 		closest_ptr   = min( closest_ptr, p );
 	}
 	return closest_ptr;
 }
 
 inline
-char const* str_trim( char const* str, b32 catch_newline )
+char const* c_str_trim( char const* str, b32 catch_newline )
 {
 	while ( *str && char_is_space( *str ) && ( ! catch_newline || ( catch_newline && *str != '\n' ) ) )
 	{
@@ -1512,7 +1839,7 @@ char const* str_trim( char const* str, b32 catch_newline )
 }
 
 inline
-void str_to_lower( char* str )
+void c_str_to_lower( char* str )
 {
 	if ( ! str )
 		return;
@@ -1524,7 +1851,7 @@ void str_to_lower( char* str )
 }
 
 inline
-void str_to_upper( char* str )
+void c_str_to_upper( char* str )
 {
 	if ( ! str )
 		return;
@@ -1539,22 +1866,23 @@ void str_to_upper( char* str )
 
 #pragma region Printing
 
-struct FileInfo;
+typedef struct FileInfo FileInfo;
 
 #ifndef GEN_PRINTF_MAXLEN
 #	define GEN_PRINTF_MAXLEN kilobytes(128)
 #endif
+typedef char PrintF_Buffer[GEN_PRINTF_MAXLEN];
 
 // NOTE: A locally persisting buffer is used internally
-char*  str_fmt_buf       ( char const* fmt, ... );
-char*  str_fmt_buf_va    ( char const* fmt, va_list va );
-ssize  str_fmt           ( char* str, ssize n, char const* fmt, ... );
-ssize  str_fmt_va        ( char* str, ssize n, char const* fmt, va_list va );
-ssize  str_fmt_out_va    ( char const* fmt, va_list va );
-ssize  str_fmt_out_err   ( char const* fmt, ... );
-ssize  str_fmt_out_err_va( char const* fmt, va_list va );
-ssize  str_fmt_file      ( FileInfo* f, char const* fmt, ... );
-ssize  str_fmt_file_va   ( FileInfo* f, char const* fmt, va_list va );
+char*  c_str_fmt_buf       ( char const* fmt, ... );
+char*  c_str_fmt_buf_va    ( char const* fmt, va_list va );
+ssize  c_str_fmt           ( char* str, ssize n, char const* fmt, ... );
+ssize  c_str_fmt_va        ( char* str, ssize n, char const* fmt, va_list va );
+ssize  c_str_fmt_out_va    ( char const* fmt, va_list va );
+ssize  c_str_fmt_out_err   ( char const* fmt, ... );
+ssize  c_str_fmt_out_err_va( char const* fmt, va_list va );
+ssize  c_str_fmt_file      ( FileInfo* f, char const* fmt, ... );
+ssize  c_str_fmt_file_va   ( FileInfo* f, char const* fmt, va_list va );
 
 constexpr
 char const* Msg_Invalid_Value = "INVALID VALUE PROVIDED";
@@ -1566,7 +1894,7 @@ ssize log_fmt(char const* fmt, ...)
 	va_list va;
 
 	va_start(va, fmt);
-	res = str_fmt_out_va(fmt, va);
+	res = c_str_fmt_out_va(fmt, va);
 	va_end(va);
 
 	return res;
@@ -1581,544 +1909,788 @@ template<class TType>             struct RemoveConst<const TType>       { typede
 template<class TType>             struct RemoveConst<const TType[]>     { typedef TType Type[];     };
 template<class TType, usize Size> struct RemoveConst<const TType[Size]> { typedef TType Type[Size]; };
 
-template<class TType>
-using TRemoveConst = typename RemoveConst<TType>::Type;
+template<class TType> using TRemoveConst = typename RemoveConst<TType>::Type;
 
+template <class TType> struct RemovePtr         { typedef TType Type; };
+template <class TType> struct RemovePtr<TType*> { typedef TType Type; };
+
+template <class TType> using TRemovePtr = typename RemovePtr<TType>::Type;
+
+
+#pragma region Array
+#define Array(Type) Array<Type>
+
+// #define array_init(Type, ...)         array_init        <Type>(__VA_ARGS__)
+// #define array_init_reserve(Type, ...) array_init_reserve<Type>(__VA_ARGS__)
+
+struct ArrayHeader;
+
+#if GEN_COMPILER_CPP
+	template<class Type> struct Array;
+#	define get_array_underlying_type(array) typename TRemovePtr<typeof(array)>:: DataType
+#endif
+
+usize array_grow_formula(ssize value);
+
+template<class Type> Array<Type>  array_init           (AllocatorInfo allocator);
+template<class Type> Array<Type>  array_init_reserve   (AllocatorInfo allocator, ssize capacity);
+template<class Type> bool         array_append_array   (Array<Type>* array, Array<Type> other);
+template<class Type> bool         array_append         (Array<Type>* array, Type value);
+template<class Type> bool         array_append_items   (Array<Type>* array, Type* items, usize item_num);
+template<class Type> bool         array_append_at      (Array<Type>* array, Type item, usize idx);
+template<class Type> bool         array_append_items_at(Array<Type>* array, Type* items, usize item_num, usize idx);
+template<class Type> Type*        array_back           (Array<Type>  array);
+template<class Type> void         array_clear          (Array<Type>  array);
+template<class Type> bool         array_fill           (Array<Type>  array, usize begin, usize end, Type value);
+template<class Type> void         array_free           (Array<Type>* array);
+template<class Type> bool         arary_grow           (Array<Type>* array, usize min_capacity);
+template<class Type> usize        array_num            (Array<Type>  array);
+template<class Type> void         arary_pop            (Array<Type>  array);
+template<class Type> void         arary_remove_at      (Array<Type>  array, usize idx);
+template<class Type> bool         arary_reserve        (Array<Type>* array, usize new_capacity);
+template<class Type> bool         arary_resize         (Array<Type>* array, usize num);
+template<class Type> bool         arary_set_capacity   (Array<Type>* array, usize new_capacity);
+template<class Type> ArrayHeader* arary_get_header     (Array<Type>  array);
+
+struct ArrayHeader {
+	AllocatorInfo Allocator;
+	usize         Capacity;
+	usize         Num;
+};
+
+#if GEN_COMPILER_CPP
 template<class Type>
 struct Array
 {
-	struct Header
-	{
-		AllocatorInfo Allocator;
-		usize            Capacity;
-		usize            Num;
-	};
-
-	static
-	Array init( AllocatorInfo allocator )
-	{
-		return init_reserve( allocator, grow_formula(0) );
-	}
-
-	static
-	Array init_reserve( AllocatorInfo allocator, ssize capacity )
-	{
-		Header* header = rcast( Header*, alloc( allocator, sizeof(Header) + sizeof(Type) * capacity ));
-
-		if ( header == nullptr )
-			return { nullptr };
-
-		header->Allocator = allocator;
-		header->Capacity  = capacity;
-		header->Num       = 0;
-
-		return { rcast( Type*, header + 1) };
-	}
-
-	static
-	usize grow_formula( usize value )
-	{
-		return 2 * value + 8;
-	}
-
-	bool append( Array other )
-	{
-		return append( other, other.num() );
-	}
-
-	bool append( Type value )
-	{
-		Header* header = get_header();
-
-		if ( header->Num == header->Capacity )
-		{
-			if ( ! grow( header->Capacity ))
-				return false;
-
-			header = get_header();
-		}
-
-		Data[ header->Num ] = value;
-		header->Num++;
-
-		return true;
-	}
-
-	bool append( Type* items, usize item_num )
-	{
-		Header* header = get_header();
-
-		if ( header->Num + item_num > header->Capacity )
-		{
-			if ( ! grow( header->Capacity + item_num ))
-				return false;
-
-			header = get_header();
-		}
-
-		mem_copy( Data + header->Num, items, item_num * sizeof(Type) );
-		header->Num += item_num;
-
-		return true;
-	}
-
-	bool append_at( Type item, usize idx )
-	{
-		Header* header = get_header();
-
-		if ( idx >= header->Num )
-			idx = header->Num - 1;
-
-		if ( idx < 0 )
-			idx = 0;
-
-		if ( header->Capacity < header->Num + 1 )
-		{
-			if ( ! grow( header->Capacity + 1 ))
-				return false;
-
-			header = get_header();
-		}
-
-		Type* target = Data + idx;
-
-		mem_move( target + 1, target, (header->Num - idx) * sizeof(Type) );
-		header->Num++;
-
-		return true;
-	}
-
-	bool append_at( Type* items, usize item_num, usize idx )
-	{
-		Header* header = get_header();
-
-		if ( idx >= header->Num )
-		{
-			return append( items, item_num );
-		}
-
-		if ( item_num > header->Capacity )
-		{
-			if ( ! grow( header->Capacity + item_num ) )
-				return false;
-
-			header = get_header();
-		}
-
-		Type* target = Data + idx + item_num;
-		Type* src    = Data + idx;
-
-		mem_move( target, src, (header->Num - idx) * sizeof(Type) );
-		mem_copy( src, items, item_num * sizeof(Type) );
-		header->Num += item_num;
-
-		return true;
-	}
-
-	Type& back( void )
-	{
-		Header& header = * get_header();
-		return Data[ header.Num - 1 ];
-	}
-
-	void clear( void )
-	{
-		Header& header = * get_header();
-		header.Num     = 0;
-	}
-
-	bool fill( usize begin, usize end, Type value )
-	{
-		Header& header = * get_header();
-
-		if ( begin < 0 || end > header.Num )
-			return false;
-
-		for ( ssize idx = ssize(begin); idx < ssize(end); idx++ )
-		{
-			Data[ idx ] = value;
-		}
-
-		return true;
-	}
-
-	void free( void )
-	{
-		Header& header = * get_header();
-		gen::free( header.Allocator, &header );
-		Data = nullptr;
-	}
-
-	Header* get_header( void )
-	{
-		using NonConstType = TRemoveConst< Type >;
-		return rcast( Header*, const_cast<NonConstType*>(Data) ) - 1 ;
-	}
-
-	bool grow( usize min_capacity )
-	{
-		Header& header       = * get_header();
-		usize      new_capacity = grow_formula( header.Capacity );
-
-		if ( new_capacity < min_capacity )
-			new_capacity = min_capacity;
-
-		return set_capacity( new_capacity );
-	}
-
-	usize num( void )
-	{
-		return get_header()->Num;
-	}
-
-	void pop( void )
-	{
-		Header& header = * get_header();
-
-		GEN_ASSERT( header.Num > 0 );
-		header.Num--;
-	}
-
-	void remove_at( usize idx )
-	{
-		Header* header = get_header();
-		GEN_ASSERT( idx < header->Num );
-
-		mem_move( header + idx, header + idx + 1, sizeof( Type ) * ( header->Num - idx - 1 ) );
-		header->Num--;
-	}
-
-	bool reserve( usize new_capacity )
-	{
-		Header& header = * get_header();
-
-		if ( header.Capacity < new_capacity )
-			return set_capacity( new_capacity );
-
-		return true;
-	}
-
-	bool resize( usize num )
-	{
-		Header* header = get_header();
-
-		if ( header->Capacity < num )
-		{
-			if ( ! grow( num ) )
-				return false;
-
-			header = get_header();
-		}
-
-		header->Num = num;
-		return true;
-	}
-
-	bool set_capacity( usize new_capacity )
-	{
-		Header& header = * get_header();
-
-		if ( new_capacity == header.Capacity )
-			return true;
-
-		if ( new_capacity < header.Num )
-		{
-			// Already have the memory, mine as well keep it.
-			header.Num = new_capacity;
-			return true;
-		}
-
-		ssize      size       = sizeof( Header ) + sizeof( Type ) * new_capacity;
-		Header* new_header = rcast( Header*, alloc( header.Allocator, size ) );
-
-		if ( new_header == nullptr )
-			return false;
-
-		mem_move( new_header, &header, sizeof( Header ) + sizeof( Type ) * header.Num );
-
-		new_header->Capacity = new_capacity;
-
-		gen::free( header.Allocator, &header );
-
-		Data = rcast( Type*, new_header + 1);
-		return true;
-	}
-
 	Type* Data;
 
-	operator Type*()
+#pragma region Member Mapping
+	FORCEINLINE static Array  init(AllocatorInfo allocator)                         { return array_init<Type>(allocator); }
+	FORCEINLINE static Array  init_reserve(AllocatorInfo allocator, ssize capacity) { return array_init_reserve<Type>(allocator, capacity); }
+	FORCEINLINE static usize  grow_formula(ssize value)                             { return array_grow_formula<Type>(value); }
+
+	FORCEINLINE bool         append(Array other)                               { return array_append_array<Type>(this, other); }
+	FORCEINLINE bool         append(Type value)                                { return array_append<Type>(this, value); }
+	FORCEINLINE bool         append(Type* items, usize item_num)               { return array_append_items<Type>(this, items, item_num); }
+	FORCEINLINE bool         append_at(Type item, usize idx)                   { return array_append_at<Type>(this, item, idx); }
+	FORCEINLINE bool         append_at(Type* items, usize item_num, usize idx) { return array_append_items_at<Type>(this, items, item_num, idx); }
+	FORCEINLINE Type*        back()                                            { return array_back<Type>(* this); }
+	FORCEINLINE void         clear()                                           {        array_clear<Type>(* this); }
+	FORCEINLINE bool         fill(usize begin, usize end, Type value)          { return array_fill<Type>(* this, begin, end, value); }
+	FORCEINLINE void         free()                                            {        array_free<Type>(this); }
+	FORCEINLINE ArrayHeader* get_header()                                      { return array_get_header<Type>(* this); }
+	FORCEINLINE bool         grow(usize min_capacity)                          { return array_grow<Type>(this, min_capacity); }
+	FORCEINLINE usize        num()                                             { return array_num<Type>(*this); }
+	FORCEINLINE void         pop()                                             {        array_pop<Type>(* this); }
+	FORCEINLINE void         remove_at(usize idx)                              {        array_remove_at<Type>(* this, idx); }
+	FORCEINLINE bool         reserve(usize new_capacity)                       { return array_reserve<Type>(this, new_capacity); }
+	FORCEINLINE bool         resize(usize num)                                 { return array_resize<Type>(this, num); }
+	FORCEINLINE bool         set_capacity(usize new_capacity)                  { return array_set_capacity<Type>(this, new_capacity); }
+#pragma endregion Member Mapping
+
+	FORCEINLINE operator Type*()             { return Data; }
+	FORCEINLINE operator Type const*() const { return Data; }
+	FORCEINLINE Type* begin()                { return Data; }
+	FORCEINLINE Type* end()                  { return Data + get_header()->Num; }
+
+	FORCEINLINE Type&       operator[](ssize index)       { return Data[index]; }
+	FORCEINLINE Type const& operator[](ssize index) const { return Data[index]; }
+
+	using DataType = Type;
+};
+#endif
+
+#if GEN_COMPILER_CPP && 0
+template<class Type> bool append(Array<Type>& array, Array<Type> other)                         { return append( & array, other ); }
+template<class Type> bool append(Array<Type>& array, Type value)                                { return append( & array, value ); }
+template<class Type> bool append(Array<Type>& array, Type* items, usize item_num)               { return append( & array, items, item_num ); }
+template<class Type> bool append_at(Array<Type>& array, Type item, usize idx)                   { return append_at( & array, item, idx ); }
+template<class Type> bool append_at(Array<Type>& array, Type* items, usize item_num, usize idx) { return append_at( & array, items, item_num, idx ); }
+template<class Type> void free(Array<Type>& array)                                              { return free( & array ); }
+template<class Type> bool grow(Array<Type>& array, usize min_capacity)                          { return grow( & array, min_capacity); }
+template<class Type> bool reserve(Array<Type>& array, usize new_capacity)                       { return reserve( & array, new_capacity); }
+template<class Type> bool resize(Array<Type>& array, usize num)                                 { return resize( & array, num); }
+template<class Type> bool set_capacity(Array<Type>& array, usize new_capacity)                  { return set_capacity( & array, new_capacity); }
+
+template<class Type> FORCEINLINE Type* begin(Array<Type>& array)             { return array;      }
+template<class Type> FORCEINLINE Type* end(Array<Type>& array)               { return array + array_get_header(array)->Num; }
+template<class Type> FORCEINLINE Type* next(Array<Type>& array, Type* entry) { return entry + 1; }
+#endif
+
+template<class Type> FORCEINLINE Type* array_begin(Array<Type> array)             { return array;      }
+template<class Type> FORCEINLINE Type* array_end(Array<Type> array)               { return array + array_get_header(array)->Num; }
+template<class Type> FORCEINLINE Type* array_next(Array<Type> array, Type* entry) { return ++ entry; }
+
+template<class Type> inline
+Array<Type> array_init(AllocatorInfo allocator) {
+	return array_init_reserve<Type>(allocator, array_grow_formula(0));
+}
+
+template<class Type> inline
+Array<Type> array_init_reserve(AllocatorInfo allocator, ssize capacity)
+{
+	GEN_ASSERT(capacity > 0);
+	ArrayHeader* header = rcast(ArrayHeader*, alloc(allocator, sizeof(ArrayHeader) + sizeof(Type) * capacity));
+
+	if (header == nullptr)
+		return {nullptr};
+
+	header->Allocator = allocator;
+	header->Capacity  = capacity;
+	header->Num       = 0;
+
+	return {rcast(Type*, header + 1)};
+}
+
+usize array_grow_formula(ssize value) {
+	return 2 * value + 8;
+}
+
+template<class Type> inline
+bool array_append_array(Array<Type>* array, Array<Type> other) {
+	return array_append_items(array, (Type*)other, array_num(other));
+}
+
+template<class Type> inline
+bool array_append(Array<Type>* array, Type value)
+{
+	GEN_ASSERT(  array != nullptr);
+	GEN_ASSERT(* array != nullptr);
+	ArrayHeader* header = array_get_header(* array);
+
+	if (header->Num == header->Capacity)
 	{
-		return Data;
+		if ( ! array_grow(array, header->Capacity))
+			return false;
+		header = array_get_header(* array);
 	}
 
-	operator Type const*() const
+	(*array)[ header->Num] = value;
+	header->Num++;
+
+	return true;
+}
+
+template<class Type> inline
+bool array_append_items(Array<Type>* array, Type* items, usize item_num)
+{
+	GEN_ASSERT(  array != nullptr);
+	GEN_ASSERT(* array != nullptr);
+	GEN_ASSERT(items != nullptr);
+	GEN_ASSERT(item_num > 0);
+	ArrayHeader* header = array_get_header(* array);
+
+	if (header->Num + item_num > header->Capacity)
 	{
-		return Data;
+		if ( ! array_grow(array, header->Capacity + item_num))
+			return false;
+		header = array_get_header(* array);
 	}
 
-	// For-range based support
+	mem_copy((Type*)array + header->Num, items, item_num * sizeof(Type));
+	header->Num += item_num;
 
-	Type* begin()
+	return true;
+}
+
+template<class Type> inline
+bool array_append_at(Array<Type>* array, Type item, usize idx)
+{
+	GEN_ASSERT(  array != nullptr);
+	GEN_ASSERT(* array != nullptr);
+	ArrayHeader* header = array_get_header(* array);
+
+	ssize slot = idx;
+	if (slot >= header->Num)
+		slot = header->Num - 1;
+
+	if (slot < 0)
+		slot = 0;
+
+	if (header->Capacity < header->Num + 1)
 	{
-		return Data;
+		if ( ! array_grow(array, header->Capacity + 1))
+			return false;
+
+		header = array_get_header(* array);
 	}
 
-	Type* end()
+	Type* target = &(*array)[slot];
+
+	mem_move(target + 1, target, (header->Num - slot) * sizeof(Type));
+	header->Num++;
+
+	return true;
+}
+
+template<class Type> inline
+bool array_append_items_at(Array<Type>* array, Type* items, usize item_num, usize idx)
+{
+	GEN_ASSERT(  array != nullptr);
+	GEN_ASSERT(* array != nullptr);
+	ArrayHeader* header = get_header(array);
+
+	if (idx >= header->Num)
 	{
-		return Data + get_header()->Num;
+		return array_append_items(array, items, item_num);
 	}
+
+	if (item_num > header->Capacity)
+	{
+		if (! grow(array, header->Capacity + item_num))
+			return false;
+
+		header = get_header(array);
+	}
+
+	Type* target = array.Data + idx + item_num;
+	Type* src    = array.Data + idx;
+
+	mem_move(target, src, (header->Num - idx) * sizeof(Type));
+	mem_copy(src, items, item_num * sizeof(Type));
+	header->Num += item_num;
+
+	return true;
+}
+
+template<class Type> inline
+Type* array_back(Array<Type> array)
+{
+	GEN_ASSERT(array != nullptr);
+
+	ArrayHeader* header = array_get_header(array);
+	if (header->Num <= 0)
+		return nullptr;
+
+	return & (array)[header->Num - 1];
+}
+
+template<class Type> inline
+void array_clear(Array<Type> array) {
+	GEN_ASSERT(array != nullptr);
+	ArrayHeader* header = array_get_header(array);
+	header->Num = 0;
+}
+
+template<class Type> inline
+bool array_fill(Array<Type> array, usize begin, usize end, Type value)
+{
+	GEN_ASSERT(array != nullptr);
+	GEN_ASSERT(begin <= end);
+	ArrayHeader* header = array_get_header(array);
+
+	if (begin < 0 || end > header->Num)
+	return false;
+
+	for (ssize idx = ssize(begin); idx < ssize(end); idx++)
+	{
+		array[idx] = value;
+	}
+
+	return true;
+}
+
+template<class Type> FORCEINLINE
+void array_free(Array<Type>* array) {
+	GEN_ASSERT(  array != nullptr);
+	GEN_ASSERT(* array != nullptr);
+	ArrayHeader* header = array_get_header(* array);
+	allocator_free(header->Allocator, header);
+	Type** Data = (Type**)array;
+	*Data = nullptr;
+}
+
+template<class Type> FORCEINLINE
+ArrayHeader* array_get_header(Array<Type> array) {
+	GEN_ASSERT(array != nullptr);
+    Type* Data = array;
+
+	using NonConstType = TRemoveConst<Type>;
+    return rcast(ArrayHeader*, const_cast<NonConstType*>(Data)) - 1;
+}
+template<class Type> FORCEINLINE
+bool array_grow(Array<Type>* array, usize min_capacity)
+{
+	GEN_ASSERT(  array != nullptr);
+	GEN_ASSERT(* array != nullptr);
+	GEN_ASSERT( min_capacity > 0 );
+	ArrayHeader* header       = array_get_header(* array);
+	usize        new_capacity = array_grow_formula(header->Capacity);
+
+	if (new_capacity < min_capacity)
+		new_capacity = min_capacity;
+
+	return array_set_capacity(array, new_capacity);
+}
+
+template<class Type> FORCEINLINE
+usize array_num(Array<Type> array) {
+	GEN_ASSERT(array != nullptr);
+	return array_get_header(array)->Num;
+}
+
+template<class Type> FORCEINLINE
+void array_pop(Array<Type> array) {
+	GEN_ASSERT(array != nullptr);
+	ArrayHeader* header = array_get_header(array);
+	GEN_ASSERT(header->Num > 0);
+	header->Num--;
+}
+
+template<class Type> inline
+void array_remove_at(Array<Type> array, usize idx)
+{
+	GEN_ASSERT(array != nullptr);
+	ArrayHeader* header = array_get_header(array);
+	GEN_ASSERT(idx < header->Num);
+
+	mem_move(array + idx, array + idx + 1, sizeof(Type) * (header->Num - idx - 1));
+	header->Num--;
+}
+
+template<class Type> inline
+bool array_reserve(Array<Type>* array, usize new_capacity)
+{
+	GEN_ASSERT(  array != nullptr);
+	GEN_ASSERT(* array != nullptr);
+	GEN_ASSERT(num > 0)
+	ArrayHeader* header = array_get_header(array);
+
+	if (header->Capacity < new_capacity)
+		return set_capacity(array, new_capacity);
+
+	return true;
+}
+
+template<class Type> inline
+bool array_resize(Array<Type>* array, usize num)
+{
+	GEN_ASSERT(  array != nullptr);
+	GEN_ASSERT(* array != nullptr);
+	ArrayHeader* header = array_get_header(* array);
+
+	if (header->Capacity < num) {
+		if (! array_grow( array, num))
+			return false;
+		header = array_get_header(* array);
+	}
+
+	header->Num = num;
+	return true;
+}
+
+template<class Type> inline
+bool array_set_capacity(Array<Type>* array, usize new_capacity)
+{
+	GEN_ASSERT(  array != nullptr);
+	GEN_ASSERT(* array != nullptr);
+	ArrayHeader* header = array_get_header(* array);
+
+	if (new_capacity == header->Capacity)
+		return true;
+
+	if (new_capacity < header->Num)
+	{
+		header->Num = new_capacity;
+		return true;
+	}
+
+	ssize        size       = sizeof(ArrayHeader) + sizeof(Type) * new_capacity;
+	ArrayHeader* new_header = rcast(ArrayHeader*, alloc(header->Allocator, size));
+
+	if (new_header == nullptr)
+		return false;
+
+	mem_move(new_header, header, sizeof(ArrayHeader) + sizeof(Type) * header->Num);
+
+	new_header->Capacity = new_capacity;
+
+	allocator_free(header->Allocator, header);
+
+	Type** Data = (Type**)array;
+	* Data = rcast(Type*, new_header + 1);
+	return true;
+}
+
+// These are intended for use in the base library of gencpp and the C-variant of the library
+// It provides a interoperability between the C++ and C implementation of arrays. (not letting these do any crazy substiution though)
+// They are undefined in gen.hpp and gen.cpp at the end of the files.
+// We cpp library expects the user to use the regular calls as they can resolve the type fine.
+
+#define array_init(type, allocator)                        array_init           <type>                               (allocator )
+#define array_init_reserve(type, allocator, cap)           array_init_reserve   <type>                               (allocator, cap)
+#define array_append_array(array, other)                   array_append_array   < get_array_underlying_type(array) > (& array, other )
+#define array_append(array, value)                         array_append         < get_array_underlying_type(array) > (& array, value )
+#define array_append_items(array, items, item_num)         array_append_items   < get_array_underlying_type(array) > (& array, items, item_num )
+#define array_append_at(array, item, idx )                 array_append_at      < get_array_underlying_type(array) > (& array, item, idx )
+#define array_append_at_items(array, items, item_num, idx) array_append_at_items< get_array_underlying_type(array) > (& items, item_num, idx )
+#define array_back(array)                                  array_back           < get_array_underlying_type(array) > (array )
+#define array_clear(array)                                 array_clear          < get_array_underlying_type(array) > (array )
+#define array_fill(array, begin, end, value)               array_fill           < get_array_underlying_type(array) > (array, begin, end, value )
+#define array_free(array)                                  array_free           < get_array_underlying_type(array) > (& array )
+#define arary_grow(array, min_capacity)                    arary_grow           < get_array_underlying_type(array) > (& array, min_capacity)
+#define array_num(array)                                   array_num            < get_array_underlying_type(array) > (array )
+#define arary_pop(array)                                   arary_pop            < get_array_underlying_type(array) > (array )
+#define arary_remove_at(array, idx)                        arary_remove_at      < get_array_underlying_type(array) > (idx)
+#define arary_reserve(array, new_capacity)                 arary_reserve        < get_array_underlying_type(array) > (& array, new_capacity )
+#define arary_resize(array, num)                           arary_resize         < get_array_underlying_type(array) > (& array, num)
+#define arary_set_capacity(new_capacity)                   arary_set_capacity   < get_array_underlying_type(array) > (& array, new_capacity )
+#define arary_get_header(array)                            arary_get_header     < get_array_underlying_type(array) > (array )
+
+#pragma endregion Array
+
+#pragma region HashTable
+#define HashTable(Type) HashTable<Type>
+
+template<class Type> struct HashTable;
+
+#ifndef get_hashtable_underlying_type
+#define get_hashtable_underlying_type(table) typename TRemovePtr<typeof(table)>:: DataType
+#endif
+
+struct HashTableFindResult {
+	ssize HashIndex;
+	ssize PrevIndex;
+	ssize EntryIndex;
 };
 
-// TODO(Ed) : This thing needs ALOT of work.
+template<class Type>
+struct HashTableEntry {
+	u64   Key;
+	ssize Next;
+	Type  Value;
+};
+
+#define HashTableEntry(Type) HashTableEntry<Type>
+
+template<class Type> HashTable<Type>       hashtable_init        (AllocatorInfo allocator);
+template<class Type> HashTable<Type>       hashtable_init_reserve(AllocatorInfo allocator, usize num);
+template<class Type> void                  hashtable_clear       (HashTable<Type>  table);
+template<class Type> void                  hashtable_destroy     (HashTable<Type>* table);
+template<class Type> Type*                 hashtable_get         (HashTable<Type>  table, u64 key);
+template<class Type> void                  hashtable_grow        (HashTable<Type>* table);
+template<class Type> void                  hashtable_rehash      (HashTable<Type>* table, ssize new_num);
+template<class Type> void                  hashtable_rehash_fast (HashTable<Type>  table);
+template<class Type> void                  hashtable_remove      (HashTable<Type>  table, u64 key);
+template<class Type> void                  hashtable_remove_entry(HashTable<Type>  table, ssize idx);
+template<class Type> void                  hashtable_set         (HashTable<Type>* table, u64 key, Type value);
+template<class Type> ssize                 hashtable_slot        (HashTable<Type>  table, u64 key);
+template<class Type> void                  hashtable_map         (HashTable<Type>  table, void (*map_proc)(u64 key, Type value));
+template<class Type> void                  hashtable_map_mut     (HashTable<Type>  table, void (*map_proc)(u64 key, Type* value));
+
+template<class Type> ssize                 hashtable__add_entry  (HashTable<Type>* table, u64 key);
+template<class Type> HashTableFindResult   hashtable__find       (HashTable<Type>  table, u64 key);
+template<class Type> bool                  hashtable__full       (HashTable<Type>  table);
+
+static constexpr f32 HashTable_CriticalLoadScale = 0.7f;
 
 template<typename Type>
 struct HashTable
 {
-	struct FindResult
-	{
-		ssize HashIndex;
-		ssize PrevIndex;
-		ssize EntryIndex;
-	};
+	Array<ssize>                Hashes;
+	Array<HashTableEntry<Type>> Entries;
 
-	struct Entry
-	{
-		u64  Key;
-		ssize   Next;
-		Type Value;
-	};
+#if ! GEN_C_LIKE_CPP
+#pragma region Member Mapping
+	FORCEINLINE static HashTable init(AllocatorInfo allocator)                    { return	hashtable_init<Type>(allocator); }
+	FORCEINLINE static HashTable init_reserve(AllocatorInfo allocator, usize num) { return	hashtable_init_reserve<Type>(allocator, num); }
 
-	static constexpr f32 CriticalLoadScale = 0.7f;
+	FORCEINLINE void  clear()                           {        clear<Type>(*this); }
+	FORCEINLINE void  destroy()                         {        destroy<Type>(*this); }
+	FORCEINLINE Type* get(u64 key)                      { return get<Type>(*this, key); }
+	FORCEINLINE void  grow()                            {        grow<Type>(*this); }
+	FORCEINLINE void  rehash(ssize new_num)             {        rehash<Type>(*this, new_num); }
+	FORCEINLINE void  rehash_fast()                     {        rehash_fast<Type>(*this); }
+	FORCEINLINE void  remove(u64 key)                   {        remove<Type>(*this, key); }
+	FORCEINLINE void  remove_entry(ssize idx)           {        remove_entry<Type>(*this, idx); }
+	FORCEINLINE void  set(u64 key, Type value)          {        set<Type>(*this, key, value); }
+	FORCEINLINE ssize slot(u64 key)                     { return slot<Type>(*this, key); }
+	FORCEINLINE void  map(void (*proc)(u64, Type))      {        map<Type>(*this, proc); }
+	FORCEINLINE void  map_mut(void (*proc)(u64, Type*)) {        map_mut<Type>(*this, proc); }
+#pragma endregion Member Mapping
+#endif
 
-	static
-	HashTable init( AllocatorInfo allocator )
-	{
-		HashTable<Type> result = init_reserve(allocator, 8);
-		return result;
-	}
-
-	static
-	HashTable init_reserve( AllocatorInfo allocator, usize num )
-	{
-		HashTable<Type> result = { { nullptr }, { nullptr } };
-
-		result.Hashes  = Array<ssize>::init_reserve( allocator, num );
-		result.Hashes.get_header()->Num = num;
-		result.Hashes.resize( num );
-		result.Hashes.fill( 0, num, -1);
-
-		result.Entries = Array<Entry>::init_reserve( allocator, num );
-		return result;
-	}
-
-	void clear( void )
-	{
-		Entries.clear();
-		Hashes.fill( 0, Hashes.num(), -1);
-	}
-
-	void destroy( void )
-	{
-		if ( Hashes && Hashes.get_header()->Capacity )
-		{
-			Hashes.free();
-			Entries.free();
-		}
-	}
-
-	Type* get( u64 key )
-	{
-		ssize idx = find( key ).EntryIndex;
-		if ( idx >= 0 )
-			return & Entries[ idx ].Value;
-
-		return nullptr;
-	}
-
-	using MapProc = void (*)( u64 key, Type  value );
-
-	void map( MapProc map_proc )
-	{
-		GEN_ASSERT_NOT_NULL( map_proc );
-
-		for ( ssize idx = 0; idx < ssize(Entries.num()); ++idx )
-		{
-			map_proc( Entries[ idx ].Key, Entries[ idx ].Value );
-		}
-	}
-
-	using MapMutProc = void (*)( u64 key, Type* value );
-
-	void map_mut( MapMutProc map_proc )
-	{
-		GEN_ASSERT_NOT_NULL( map_proc );
-
-		for ( ssize idx = 0; idx < ssize(Entries.num()); ++idx )
-		{
-			map_proc( Entries[ idx ].Key, & Entries[ idx ].Value );
-		}
-	}
-
-	void grow()
-	{
-		ssize new_num = Array<Entry>::grow_formula( Entries.num() );
-		rehash( new_num );
-	}
-
-	void rehash( ssize new_num )
-	{
-		ssize last_added_index;
-
-		HashTable<Type> new_ht = init_reserve( Hashes.get_header()->Allocator, new_num );
-		for ( ssize idx = 0; idx < ssize(Entries.num()); ++idx )
-		{
-			FindResult find_result;
-
-			Entry& entry     = Entries[ idx ];
-			find_result      = new_ht.find( entry.Key );
-			last_added_index = new_ht.add_entry( entry.Key );
-
-			if ( find_result.PrevIndex < 0 )
-				new_ht.Hashes[ find_result.HashIndex ] = last_added_index;
-			else
-				new_ht.Entries[ find_result.PrevIndex ].Next = last_added_index;
-
-			new_ht.Entries[ last_added_index ].Next  = find_result.EntryIndex;
-			new_ht.Entries[ last_added_index ].Value = entry.Value;
-		}
-
-		destroy();
-		*this = new_ht;
-	}
-
-	void rehash_fast()
-	{
-		ssize idx;
-
-		for ( idx = 0; idx < ssize(Entries.num()); idx++ )
-			Entries[ idx ].Next = -1;
-
-		for ( idx = 0; idx < ssize(Hashes.num()); idx++ )
-			Hashes[ idx ] = -1;
-
-		for ( idx = 0; idx < ssize(Entries.num()); idx++ )
-		{
-			Entry*     entry;
-			FindResult find_result;
-
-			entry       = & Entries[ idx ];
-			find_result = find( entry->Key );
-
-			if ( find_result.PrevIndex < 0 )
-				Hashes[ find_result.HashIndex ] = idx;
-			else
-				Entries[ find_result.PrevIndex ].Next = idx;
-		}
-	}
-
-	void remove( u64 key )
-	{
-		FindResult find_result = find( key);
-
-		if ( find_result.EntryIndex >= 0 )
-		{
-			Entries.remove_at( find_result.EntryIndex );
-			rehash_fast();
-		}
-	}
-
-	void remove_entry( ssize idx )
-	{
-		Entries.remove_at( idx );
-	}
-
-	void set( u64 key, Type value )
-	{
-		ssize idx;
-		FindResult find_result;
-
-		if ( full() )
-			grow();
-
-		find_result = find( key );
-		if ( find_result.EntryIndex >= 0 )
-		{
-			idx = find_result.EntryIndex;
-		}
-		else
-		{
-			idx = add_entry( key );
-
-			if ( find_result.PrevIndex >= 0 )
-			{
-				Entries[ find_result.PrevIndex ].Next = idx;
-			}
-			else
-			{
-				Hashes[ find_result.HashIndex ] = idx;
-			}
-		}
-
-		Entries[ idx ].Value = value;
-
-		if ( full() )
-			grow();
-	}
-
-	ssize slot( u64 key )
-	{
-		for ( ssize idx = 0; idx < ssize(Hashes.num()); ++idx )
-			if ( Hashes[ idx ] == key )
-				return idx;
-
-		return -1;
-	}
-
-	Array< ssize>    Hashes;
-	Array< Entry> Entries;
-
-protected:
-
-	ssize add_entry( u64 key )
-	{
-		ssize idx;
-		Entry entry = { key, -1 };
-
-		idx = Entries.num();
-		Entries.append( entry );
-		return idx;
-	}
-
-	FindResult find( u64 key )
-	{
-		FindResult result = { -1, -1, -1 };
-
-		if ( Hashes.num() > 0 )
-		{
-			result.HashIndex    = key % Hashes.num();
-			result.EntryIndex  = Hashes[ result.HashIndex ];
-
-			while ( result.EntryIndex >= 0 )
-			{
-				if ( Entries[ result.EntryIndex ].Key == key )
-					break;
-
-				result.PrevIndex  = result.EntryIndex;
-				result.EntryIndex = Entries[ result.EntryIndex ].Next;
-			}
-		}
-
-		return result;
-	}
-
-	b32 full()
-	{
-		usize critical_load = usize( CriticalLoadScale * f32(Hashes.num()) );
-		b32 result = Entries.num() > critical_load;
-		return result;
-	}
+	using DataType = Type;
 };
 
+#if GEN_SUPPORT_CPP_REFERENCES
+template<class Type> void  destroy  (HashTable<Type>& table)                      { destroy(& table); }
+template<class Type> void  grow     (HashTable<Type>& table)                      { grow(& table); }
+template<class Type> void  rehash   (HashTable<Type>& table, ssize new_num)       { rehash(& table, new_num); }
+template<class Type> void  set      (HashTable<Type>& table, u64 key, Type value) { set(& table, key, value); }
+template<class Type> ssize add_entry(HashTable<Type>& table, u64 key)             { add_entry(& table, key); }
+#endif
+
+template<typename Type> inline
+HashTable<Type> hashtable_init(AllocatorInfo allocator) {
+	HashTable<Type> result = hashtable_init_reserve<Type>(allocator, 8);
+	return result;
+}
+
+template<typename Type> inline
+HashTable<Type> hashtable_init_reserve(AllocatorInfo allocator, usize num)
+{
+	HashTable<Type> result = { { nullptr }, { nullptr } };
+
+	result.Hashes = array_init_reserve<ssize>(allocator, num);
+	array_get_header(result.Hashes)->Num = num;
+	array_resize(& result.Hashes, num);
+	array_fill(result.Hashes, 0, num, (ssize)-1);
+
+	result.Entries = array_init_reserve<HashTableEntry<Type>>(allocator, num);
+	return result;
+}
+
+template<typename Type> FORCEINLINE
+void hashtable_clear(HashTable<Type> table) {
+	GEN_ASSERT_NOT_NULL(table.Hashes);
+	GEN_ASSERT_NOT_NULL(table.Entries);
+	array_clear(table.Entries);
+	array_fill(table.Hashes, 0, array_num(table.Hashes), (ssize)-1);
+}
+
+template<typename Type> FORCEINLINE
+void hashtable_destroy(HashTable<Type>* table) {
+	GEN_ASSERT_NOT_NULL(table->Hashes);
+	GEN_ASSERT_NOT_NULL(table->Entries);
+	if (table->Hashes && array_get_header(table->Hashes)->Capacity) {
+		array_free(table->Hashes);
+		array_free(table->Entries);
+	}
+}
+
+template<typename Type> FORCEINLINE
+Type* hashtable_get(HashTable<Type> table, u64 key) {
+	GEN_ASSERT_NOT_NULL(table.Hashes);
+	GEN_ASSERT_NOT_NULL(table.Entries);
+	ssize idx = hashtable__find(table, key).EntryIndex;
+	if (idx >= 0)
+		return & table.Entries[idx].Value;
+
+	return nullptr;
+}
+
+template<typename Type> FORCEINLINE
+void hashtable_map(HashTable<Type> table, void (*map_proc)(u64 key, Type value)) {
+	GEN_ASSERT_NOT_NULL(table.Hashes);
+	GEN_ASSERT_NOT_NULL(table.Entries);
+	GEN_ASSERT_NOT_NULL(map_proc);
+
+	for (ssize idx = 0; idx < ssize(num(table.Entries)); ++idx) {
+		map_proc(table.Entries[idx].Key, table.Entries[idx].Value);
+	}
+}
+
+template<typename Type> FORCEINLINE
+void hashtable_map_mut(HashTable<Type> table, void (*map_proc)(u64 key, Type* value)) {
+	GEN_ASSERT_NOT_NULL(table.Hashes);
+	GEN_ASSERT_NOT_NULL(table.Entries);
+	GEN_ASSERT_NOT_NULL(map_proc);
+
+	for (ssize idx = 0; idx < ssize(num(table.Entries)); ++idx) {
+		map_proc(table.Entries[idx].Key, & table.Entries[idx].Value);
+	}
+}
+
+template<typename Type> FORCEINLINE
+void hashtable_grow(HashTable<Type>* table) {
+	GEN_ASSERT_NOT_NULL(table);
+	GEN_ASSERT_NOT_NULL(table->Hashes);
+	GEN_ASSERT_NOT_NULL(table->Entries);
+	ssize new_num = array_grow_formula( array_num(table->Entries));
+	hashtable_rehash(table, new_num);
+}
+
+template<typename Type> inline
+void hashtable_rehash(HashTable<Type>* table, ssize new_num)
+{
+	GEN_ASSERT_NOT_NULL(table);
+	GEN_ASSERT_NOT_NULL(table->Hashes);
+	GEN_ASSERT_NOT_NULL(table->Entries);
+	ssize last_added_index;
+	HashTable<Type> new_ht = hashtable_init_reserve<Type>( array_get_header(table->Hashes)->Allocator, new_num);
+
+	for (ssize idx = 0; idx < ssize( array_num(table->Entries)); ++idx)
+	{
+		HashTableFindResult find_result;
+		HashTableEntry<Type>& entry = table->Entries[idx];
+
+		find_result = hashtable__find(new_ht, entry.Key);
+		last_added_index = hashtable__add_entry(& new_ht, entry.Key);
+
+		if (find_result.PrevIndex < 0)
+			new_ht.Hashes[find_result.HashIndex] = last_added_index;
+		else
+			new_ht.Entries[find_result.PrevIndex].Next = last_added_index;
+
+		new_ht.Entries[last_added_index].Next = find_result.EntryIndex;
+		new_ht.Entries[last_added_index].Value = entry.Value;
+	}
+
+	hashtable_destroy(table);
+	* table = new_ht;
+}
+
+template<typename Type> inline
+void hashtable_rehash_fast(HashTable<Type> table)
+{
+	GEN_ASSERT_NOT_NULL(table.Hashes);
+	GEN_ASSERT_NOT_NULL(table.Entries);
+	ssize idx;
+
+	for (idx = 0; idx < ssize(num(table.Entries)); idx++)
+		table.Entries[idx].Next = -1;
+
+	for (idx = 0; idx < ssize(num(table.Hashes)); idx++)
+		table.Hashes[idx] = -1;
+
+	for (idx = 0; idx < ssize(num(table.Entries)); idx++)
+	{
+		HashTableEntry<Type>* entry;
+		HashTableFindResult find_result;
+
+		entry = &table.Entries[idx];
+		find_result = find(table, entry->Key);
+
+		if (find_result.PrevIndex < 0)
+			table.Hashes[find_result.HashIndex] = idx;
+		else
+			table.Entries[find_result.PrevIndex].Next = idx;
+	}
+}
+
+template<typename Type> FORCEINLINE
+void hashtable_remove(HashTable<Type> table, u64 key) {
+	GEN_ASSERT_NOT_NULL(table.Hashes);
+	GEN_ASSERT_NOT_NULL(table.Entries);
+	HashTableFindResult find_result = find(table, key);
+
+	if (find_result.EntryIndex >= 0) {
+		remove_at(table.Entries, find_result.EntryIndex);
+		rehash_fast(table);
+	}
+}
+
+template<typename Type> FORCEINLINE
+void hashtable_remove_entry(HashTable<Type> table, ssize idx) {
+	GEN_ASSERT_NOT_NULL(table.Hashes);
+	GEN_ASSERT_NOT_NULL(table.Entries);
+	remove_at(table.Entries, idx);
+}
+
+template<typename Type> inline
+void hashtable_set(HashTable<Type>* table, u64 key, Type value)
+{
+	GEN_ASSERT_NOT_NULL(table);
+	GEN_ASSERT_NOT_NULL(table->Hashes);
+	GEN_ASSERT_NOT_NULL(table->Entries);
+	ssize idx;
+	HashTableFindResult find_result;
+
+	if (hashtable_full(* table))
+		hashtable_grow(table);
+
+	find_result = hashtable__find(* table, key);
+	if (find_result.EntryIndex >= 0) {
+		idx = find_result.EntryIndex;
+	}
+	else
+	{
+		idx = hashtable__add_entry(table, key);
+
+		if (find_result.PrevIndex >= 0) {
+			table->Entries[find_result.PrevIndex].Next = idx;
+		}
+		else {
+			table->Hashes[find_result.HashIndex] = idx;
+		}
+	}
+
+	table->Entries[idx].Value = value;
+
+	if (hashtable_full(* table))
+		hashtable_grow(table);
+}
+
+template<typename Type> FORCEINLINE
+ssize hashtable_slot(HashTable<Type> table, u64 key) {
+	GEN_ASSERT_NOT_NULL(table.Hashes);
+	GEN_ASSERT_NOT_NULL(table.Entries);
+	for (ssize idx = 0; idx < ssize(num(table.Hashes)); ++idx)
+		if (table.Hashes[idx] == key)
+			return idx;
+
+	return -1;
+}
+
+template<typename Type> FORCEINLINE
+ssize hashtable__add_entry(HashTable<Type>* table, u64 key) {
+	GEN_ASSERT_NOT_NULL(table);
+	GEN_ASSERT_NOT_NULL(table->Hashes);
+	GEN_ASSERT_NOT_NULL(table->Entries);
+	ssize idx;
+	HashTableEntry<Type> entry = { key, -1 };
+
+	idx = array_num(table->Entries);
+	array_append( table->Entries, entry);
+	return idx;
+}
+
+template<typename Type> inline
+HashTableFindResult hashtable__find(HashTable<Type> table, u64 key)
+{
+	GEN_ASSERT_NOT_NULL(table.Hashes);
+	GEN_ASSERT_NOT_NULL(table.Entries);
+	HashTableFindResult result = { -1, -1, -1 };
+
+	if (array_num(table.Hashes) > 0)
+	{
+		result.HashIndex = key % array_num(table.Hashes);
+		result.EntryIndex = table.Hashes[result.HashIndex];
+
+		while (result.EntryIndex >= 0)
+		{
+			if (table.Entries[result.EntryIndex].Key == key)
+				break;
+
+			result.PrevIndex = result.EntryIndex;
+			result.EntryIndex = table.Entries[result.EntryIndex].Next;
+		}
+	}
+
+	return result;
+}
+
+template<typename Type> FORCEINLINE
+bool hashtable_full(HashTable<Type> table) {
+	GEN_ASSERT_NOT_NULL(table.Hashes);
+	GEN_ASSERT_NOT_NULL(table.Entries);
+	usize critical_load = usize(HashTable_CriticalLoadScale * f32(array_num(table.Hashes)));
+	b32 result = array_num(table.Entries) > critical_load;
+	return result;
+}
+
+#define hashtable_init(type, allocator)              hashtable_init        <type              >(allocator)
+#define hashtable_init_reserve(type, allocator, num) hashtable_init_reserve<type              >(allocator, num)
+#define hashtable_clear(table)                       hashtable_clear       < get_hashtable_underlying_type(table) >(table)
+#define hashtable_destroy(table)                     hashtable_destroy     < get_hashtable_underlying_type(table) >(& table)
+#define hashtable_get(table, key)                    hashtable_get         < get_hashtable_underlying_type(table) >(table, key)
+#define hashtable_grow(table)                        hashtable_grow        < get_hashtable_underlying_type(table) >(& table)
+#define hashtable_rehash(table, new_num)             hashtable_rehash      < get_hashtable_underlying_type(table) >(& table, new_num)
+#define hashtable_rehash_fast(table)                 hashtable_rehash_fast < get_hashtable_underlying_type(table) >(table)
+#define hashtable_remove(table, key)                 hashtable_remove      < get_hashtable_underlying_type(table) >(table, key)
+#define hashtable_remove_entry(table, idx)           hashtable_remove_entry< get_hashtable_underlying_type(table) >(table, idx)
+#define hashtable_set(table, key, value)             hashtable_set         < get_hashtable_underlying_type(table) >(& table, key, value)
+#define hashtable_slot(table, key)                   hashtable_slot        < get_hashtable_underlying_type(table) >(table, key)
+#define hashtable_map(table, map_proc)               hashtable_map         < get_hashtable_underlying_type(table) >(table, map_proc)
+#define hashtable_map_mut(table, map_proc)           hashtable_map_mut     < get_hashtable_underlying_type(table) >(table, map_proc)
+
+//#define hashtable_add_entry(table, key)              hashtable_add_entry   < get_hashtable_underlying_type(table) >(& table, key)
+//#define hashtable_find(table, key)                   hashtable_find        < get_hashtable_underlying_type(table) >(table, key)
+//#define hashtable_full(table)                        hashtable_full        < get_hashtable_underlying_type(table) >(table)
+
+#pragma endregion HashTable
+
 #pragma endregion Containers
 
 #pragma region Hashing
@@ -2130,457 +2702,746 @@ u64 crc64( void const* data, ssize len );
 
 #pragma region Strings
 
-// Constant string with length.
-struct StrC
-{
-	ssize          Len;
-	char const* Ptr;
+struct Str;
 
-	operator char const* ()               const { return Ptr; }
-	char const& operator[]( ssize index ) const { return Ptr[index]; }
+Str         to_str_from_c_str       (char const* bad_string);
+bool        str_are_equal           (Str lhs, Str rhs);
+char const* str_back                (Str str);
+bool        str_contains            (Str str, Str substring);
+Str         str_duplicate           (Str str, AllocatorInfo allocator);
+b32         str_starts_with         (Str str, Str substring);
+Str         str_visualize_whitespace(Str str, AllocatorInfo allocator);
+
+// Constant string with length.
+struct Str
+{
+	char const* Ptr;
+	ssize       Len;
+
+#if GEN_COMPILER_CPP
+	FORCEINLINE operator char const* ()               const { return Ptr; }
+	FORCEINLINE char const& operator[]( ssize index ) const { return Ptr[index]; }
+
+#if ! GEN_C_LIKE_CPP
+	FORCEINLINE bool        is_equal            (Str rhs)                 const { return str_are_equal(* this, rhs); }
+	FORCEINLINE char const* back                ()                        const { return str_back(* this); }
+	FORCEINLINE bool        contains            (Str substring)           const { return str_contains(* this, substring); }
+	FORCEINLINE Str         duplicate           (AllocatorInfo allocator) const { return str_duplicate(* this, allocator); }
+	FORCEINLINE b32         starts_with         (Str substring)           const { return str_starts_with(* this, substring); }
+	FORCEINLINE Str         visualize_whitespace(AllocatorInfo allocator) const { return str_visualize_whitespace(* this, allocator); }
+#endif
+#endif
 };
 
-#define cast_to_strc( str ) * rcast( StrC*, (str) - sizeof(ssize) )
-#define txt( text )         StrC { sizeof( text ) - 1, ( text ) }
+#define cast_to_str( str ) * rcast( Str*, (str) - sizeof(ssize) )
+
+#ifndef txt
+#	if GEN_COMPILER_CPP
+#		define txt( text )          GEN_NS Str { ( text ), sizeof( text ) - 1 }
+#	else
+#		define txt( text )         (GEN_NS Str){ ( text ), sizeof( text ) - 1 }
+#	endif
+#endif
+
+GEN_API_C_BEGIN
+FORCEINLINE char const* str_begin(Str str)                   { return str.Ptr; }
+FORCEINLINE char const* str_end  (Str str)                   { return str.Ptr + str.Len; }
+FORCEINLINE char const* str_next (Str str, char const* iter) { return iter + 1; }
+GEN_API_C_END
+
+#if GEN_COMPILER_CPP
+FORCEINLINE char const* begin(Str str)                   { return str.Ptr; }
+FORCEINLINE char const* end  (Str str)                   { return str.Ptr + str.Len; }
+FORCEINLINE char const* next (Str str, char const* iter) { return iter + 1; }
+#endif
 
 inline
-StrC to_str( char const* str )
+bool str_are_equal(Str lhs, Str rhs)
 {
-	return { str_len( str ), str };
+	if (lhs.Len != rhs.Len)
+		return false;
+
+	for (ssize idx = 0; idx < lhs.Len; ++idx)
+		if (lhs.Ptr[idx] != rhs.Ptr[idx])
+			return false;
+
+	return true;
 }
 
-// Dynamic String
+inline
+char const* str_back(Str str) {
+	return & str.Ptr[str.Len - 1];
+}
+
+inline
+bool str_contains(Str str, Str substring)
+{
+	if (substring.Len > str.Len)
+		return false;
+
+	ssize main_len = str.Len;
+	ssize sub_len  = substring.Len;
+	for (ssize idx = 0; idx <= main_len - sub_len; ++idx)
+	{
+		if (c_str_compare_len(str.Ptr + idx, substring.Ptr, sub_len) == 0)
+			return true;
+	}
+	return false;
+}
+
+inline
+b32 str_starts_with(Str str, Str substring) {
+	if (substring.Len > str.Len)
+		return false;
+
+	b32 result = c_str_compare_len(str.Ptr, substring.Ptr, substring.Len) == 0;
+		return result;
+}
+
+inline
+Str to_str_from_c_str( char const* bad_str ) {
+	Str result = { bad_str, c_str_len( bad_str ) };
+	return result;
+}
+
+// Dynamic StrBuilder
 // This is directly based off the ZPL string api.
 // They used a header pattern
 // I kept it for simplicty of porting but its not necessary to keep it that way.
-struct String
+#pragma region StrBuilder
+struct StrBuilderHeader;
+
+#if GEN_COMPILER_C
+typedef char* StrBuilder;
+#else
+struct StrBuilder;
+#endif
+
+FORCEINLINE usize strbuilder_grow_formula(usize value);
+
+StrBuilder        strbuilder_make_c_str          (AllocatorInfo allocator, char const*  str);
+StrBuilder        strbuilder_make_str            (AllocatorInfo allocator, Str         str);
+StrBuilder        strbuilder_make_reserve        (AllocatorInfo allocator, ssize        capacity);
+StrBuilder        strbuilder_make_length         (AllocatorInfo allocator, char const*  str,   ssize length);
+StrBuilder        strbuilder_fmt                 (AllocatorInfo allocator, char*        buf,   ssize buf_size,  char const* fmt, ...);
+StrBuilder        strbuilder_fmt_buf             (AllocatorInfo allocator, char const*  fmt, ...);
+StrBuilder        strbuilder_join                (AllocatorInfo allocator, char const** parts, ssize num_parts, char const* glue);
+bool              strbuilder_are_equal           (StrBuilder const lhs, StrBuilder const rhs);
+bool              strbuilder_are_equal_str       (StrBuilder const lhs, Str rhs);
+bool              strbuilder_make_space_for      (StrBuilder*      str, char const*  to_append, ssize add_len);
+bool              strbuilder_append_char         (StrBuilder*      str, char         c);
+bool              strbuilder_append_c_str        (StrBuilder*      str, char const*  c_str_to_append);
+bool              strbuilder_append_c_str_len    (StrBuilder*      str, char const*  c_str_to_append, ssize length);
+bool              strbuilder_append_str          (StrBuilder*      str, Str         c_str_to_append);
+bool              strbuilder_append_string       (StrBuilder*      str, StrBuilder const other);
+bool              strbuilder_append_fmt          (StrBuilder*      str, char const*  fmt, ...);
+ssize             strbuilder_avail_space         (StrBuilder const str);
+char*             strbuilder_back                (StrBuilder       str);
+bool              strbuilder_contains_str        (StrBuilder const str, Str         substring);
+bool              strbuilder_contains_string     (StrBuilder const str, StrBuilder const substring);
+ssize             strbuilder_capacity            (StrBuilder const str);
+void              strbuilder_clear               (StrBuilder       str);
+StrBuilder        strbuilder_duplicate           (StrBuilder const str, AllocatorInfo allocator);
+void              strbuilder_free                (StrBuilder*      str);
+StrBuilderHeader* strbuilder_get_header          (StrBuilder       str);
+ssize             strbuilder_length              (StrBuilder const str);
+b32               strbuilder_starts_with_str     (StrBuilder const str, Str   substring);
+b32               strbuilder_starts_with_string  (StrBuilder const str, StrBuilder substring);
+void              strbuilder_skip_line           (StrBuilder       str);
+void              strbuilder_strip_space         (StrBuilder       str);
+Str               strbuilder_to_str              (StrBuilder       str);
+void              strbuilder_trim                (StrBuilder       str, char const* cut_set);
+void              strbuilder_trim_space          (StrBuilder       str);
+StrBuilder        strbuilder_visualize_whitespace(StrBuilder const str);
+
+struct StrBuilderHeader {
+	AllocatorInfo Allocator;
+	ssize         Capacity;
+	ssize         Length;
+};
+
+#if GEN_COMPILER_CPP
+struct StrBuilder
 {
-	struct Header
-	{
-		AllocatorInfo Allocator;
-		ssize            Capacity;
-		ssize            Length;
-	};
+	char* Data;
 
-	static
-	usize grow_formula( usize value )
-	{
-		// Using a very aggressive growth formula to reduce time mem_copying with recursive calls to append in this library.
-		return 4 * value + 8;
-	}
+	FORCEINLINE operator char*()             { return Data; }
+	FORCEINLINE operator char const*() const { return Data; }
+	FORCEINLINE operator Str()         const { return { Data, strbuilder_length(* this) }; }
 
-	static
-	String make( AllocatorInfo allocator, char const* str )
-	{
-		ssize length = str ? str_len( str ) : 0;
-		return make_length( allocator, str, length );
-	}
-
-	static
-	String make( AllocatorInfo allocator, StrC str )
-	{
-		return make_length( allocator, str.Ptr, str.Len );
-	}
-
-	static
-	String make_reserve( AllocatorInfo allocator, ssize capacity );
-
-	static
-	String make_length( AllocatorInfo allocator, char const* str, ssize length );
-
-	static
-	String fmt( AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ... );
-
-	static
-	String fmt_buf( AllocatorInfo allocator, char const* fmt, ... );
-
-	static
-	String join( AllocatorInfo allocator, char const** parts, ssize num_parts, char const* glue )
-	{
-		String result = make( allocator, "" );
-
-		for ( ssize idx = 0; idx < num_parts; ++idx )
-		{
-			result.append( parts[ idx ] );
-
-			if ( idx < num_parts - 1 )
-				result.append( glue );
-		}
-
-		return result;
-	}
-
-	static
-	bool are_equal( String lhs, String rhs )
-	{
-		if ( lhs.length() != rhs.length() )
-			return false;
-
-		for ( ssize idx = 0; idx < lhs.length(); ++idx )
-			if ( lhs[ idx ] != rhs[ idx ] )
-				return false;
-
-		return true;
-	}
-
-	static
-	bool are_equal( String lhs, StrC rhs )
-	{
-		if ( lhs.length() != (rhs.Len) )
-			return false;
-
-		for ( ssize idx = 0; idx < lhs.length(); ++idx )
-			if ( lhs[idx] != rhs[idx] )
-				return false;
-
-		return true;
-	}
-
-	bool make_space_for( char const* str, ssize add_len );
-
-	bool append( char c )
-	{
-		return append( & c, 1 );
-	}
-
-	bool append( char const* str )
-	{
-		return append( str, str_len( str ) );
-	}
-
-	bool append( char const* str, ssize length )
-	{
-		if ( sptr(str) > 0 )
-		{
-			ssize curr_len = this->length();
-
-			if ( ! make_space_for( str, length ) )
-				return false;
-
-			Header& header = get_header();
-
-			mem_copy( Data + curr_len, str, length );
-
-			Data[ curr_len + length ] = '\0';
-
-			header.Length = curr_len + length;
-		}
-		return str != nullptr;
-	}
-
-	bool append( StrC str)
-	{
-		return append( str.Ptr, str.Len );
-	}
-
-	bool append( const String other )
-	{
-		return append( other.Data, other.length() );
-	}
-
-	bool append_fmt( char const* fmt, ... );
-
-	ssize avail_space() const
-	{
-		Header const&
-		header = * rcast( Header const*, Data - sizeof( Header ));
-
-		return header.Capacity - header.Length;
-	}
-
-	char& back()
-	{
-		return Data[ length() - 1 ];
-	}
-
-	bool contains(StrC substring) const
-	{
-		Header const& header = * rcast( Header const*, Data - sizeof( Header ));
-
-		if (substring.Len > header.Length)
-			return false;
-
-		ssize main_len = header.Length;
-		ssize sub_len  = substring.Len;
-
-		for (ssize i = 0; i <= main_len - sub_len; ++i)
-		{
-			if (str_compare(Data + i, substring.Ptr, sub_len) == 0)
-				return true;
-		}
-
-		return false;
-	}
-
-	bool contains(String const& substring) const
-	{
-		Header const& header = * rcast( Header const*, Data - sizeof( Header ));
-
-		if (substring.length() > header.Length)
-			return false;
-
-		ssize main_len = header.Length;
-		ssize sub_len  = substring.length();
-
-		for (ssize i = 0; i <= main_len - sub_len; ++i)
-		{
-			if (str_compare(Data + i, substring.Data, sub_len) == 0)
-				return true;
-		}
-
-		return false;
-	}
-
-	ssize capacity() const
-	{
-		Header const&
-		header = * rcast( Header const*, Data - sizeof( Header ));
-
-		return header.Capacity;
-	}
-
-	void clear()
-	{
-		get_header().Length = 0;
-	}
-
-	String duplicate( AllocatorInfo allocator ) const
-	{
-		return make_length( allocator, Data, length() );
-	}
-
-	void free()
-	{
-		if ( ! Data )
-			return;
-
-		Header& header = get_header();
-
-		gen::free( header.Allocator, & header );
-	}
-
-	Header& get_header()
-	{
-		return *(Header*)(Data - sizeof(Header));
-	}
-
-	ssize length() const
-	{
-		Header const&
-		header = * rcast( Header const*, Data - sizeof( Header ));
-
-		return header.Length;
-	}
-
-	b32 starts_with( StrC substring ) const
-	{
-		if (substring.Len > length())
-			return false;
-
-		b32 result = str_compare(Data, substring.Ptr, substring.Len ) == 0;
-		return result;
-	}
-
-	b32 starts_with( String substring ) const
-	{
-		if (substring.length() > length())
-			return false;
-
-		b32 result = str_compare(Data, substring, substring.length() - 1 ) == 0;
-		return result;
-	}
-
-	void skip_line()
-	{
-	#define current (*scanner)
-		char* scanner = Data;
-		while ( current != '\r' && current != '\n' )
-		{
-			++ scanner;
-		}
-
-		s32 new_length = scanner - Data;
-
-		if ( current == '\r' )
-		{
-			new_length += 1;
-		}
-
-		mem_move( Data, scanner, new_length );
-
-		Header* header = & get_header();
-		header->Length = new_length;
-	#undef current
-	}
-
-	void strip_space()
-	{
-		char* write_pos = Data;
-		char* read_pos  = Data;
-
-		while ( * read_pos)
-		{
-			if ( ! char_is_space( *read_pos ))
-			{
-				*write_pos = *read_pos;
-				write_pos++;
-			}
-			read_pos++;
-		}
-
-		write_pos[0] = '\0';  // Null-terminate the modified string
-
-		// Update the length if needed
-		get_header().Length = write_pos - Data;
-	}
-
-	void trim( char const* cut_set )
-	{
-		ssize len = 0;
-
-		char* start_pos = Data;
-		char* end_pos   = Data + length() - 1;
-
-		while ( start_pos <= end_pos && char_first_occurence( cut_set, *start_pos ) )
-			start_pos++;
-
-		while ( end_pos > start_pos && char_first_occurence( cut_set, *end_pos ) )
-			end_pos--;
-
-		len = scast( ssize, ( start_pos > end_pos ) ? 0 : ( ( end_pos - start_pos ) + 1 ) );
-
-		if ( Data != start_pos )
-			mem_move( Data, start_pos, len );
-
-		Data[ len ] = '\0';
-
-		get_header().Length = len;
-	}
-
-	void trim_space()
-	{
-		return trim( " \t\r\n\v\f" );
-	}
-
-	// Debug function that provides a copy of the string with whitespace characters visualized.
-	String visualize_whitespace() const
-	{
-		Header* header = (Header*)(Data - sizeof(Header));
-
-		String result = make_reserve(header->Allocator, length() * 2); // Assume worst case for space requirements.
-
-		for ( char c : *this )
-		{
-			switch ( c )
-			{
-				case ' ':
-					result.append( txt("·") );
-				break;
-				case '\t':
-					result.append( txt("→") );
-				break;
-				case '\n':
-					result.append( txt("↵") );
-				break;
-				case '\r':
-					result.append( txt("⏎") );
-				break;
-				case '\v':
-					result.append( txt("⇕") );
-				break;
-				case '\f':
-					result.append( txt("⌂") );
-				break;
-				default:
-					result.append(c);
-				break;
-			}
-		}
-
-		return result;
-	}
-
-	// For-range support
-
-	char* begin() const
-	{
-		return Data;
-	}
-
-	char* end() const
-	{
-		Header const&
-		header = * rcast( Header const*, Data - sizeof( Header ));
-
-		return Data + header.Length;
-	}
-
-	operator bool()
-	{
-		return Data != nullptr;
-	}
-
-	operator char* ()
-	{
-		return Data;
-	}
-
-	operator char const* () const
-	{
-		return Data;
-	}
-
-	operator StrC() const
-	{
-		return { length(), Data };
-	}
-
-	// Used with cached strings
-	// Essentially makes the string a string view.
-	String const& operator = ( String const& other ) const
-	{
-		if ( this == & other )
+	StrBuilder const& operator=(StrBuilder const& other) const {
+		if (this == &other)
 			return *this;
 
-		String*
-		this_ = ccast(String*, this);
+		StrBuilder* this_ = ccast(StrBuilder*, this);
 		this_->Data = other.Data;
 
 		return *this;
 	}
 
-	char& operator [] ( ssize index )
-	{
-		return Data[ index ];
+	FORCEINLINE char&       operator[](ssize index)       { return Data[index]; }
+	FORCEINLINE char const& operator[](ssize index) const { return Data[index]; }
+
+	       FORCEINLINE bool operator==(std::nullptr_t) const                 { return     Data == nullptr; }
+	       FORCEINLINE bool operator!=(std::nullptr_t) const                 { return     Data != nullptr; }
+	friend FORCEINLINE bool operator==(std::nullptr_t, const StrBuilder str) { return str.Data == nullptr; }
+	friend FORCEINLINE bool operator!=(std::nullptr_t, const StrBuilder str) { return str.Data != nullptr; }
+
+#if ! GEN_C_LIKE_CPP
+	FORCEINLINE char* begin() const { return Data; }
+	FORCEINLINE char* end()   const { return Data + strbuilder_length(* this); }
+
+#pragma region Member Mapping
+	FORCEINLINE static StrBuilder make(AllocatorInfo allocator, char const* str)                { return strbuilder_make_c_str(allocator, str); }
+	FORCEINLINE static StrBuilder make(AllocatorInfo allocator, Str str)                        { return strbuilder_make_str(allocator, str); }
+	FORCEINLINE static StrBuilder make_reserve(AllocatorInfo allocator, ssize cap)              { return strbuilder_make_reserve(allocator, cap); }
+	FORCEINLINE static StrBuilder make_length(AllocatorInfo a, char const* s, ssize l)          { return strbuilder_make_length(a, s, l); }
+	FORCEINLINE static StrBuilder join(AllocatorInfo a, char const** p, ssize n, char const* g) { return strbuilder_join(a, p, n, g); }
+	FORCEINLINE static usize      grow_formula(usize value)                                     { return strbuilder_grow_formula(value); }
+
+	static
+	StrBuilder fmt(AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ...) {
+		va_list va;
+		va_start(va, fmt);
+		ssize res = c_str_fmt_va(buf, buf_size, fmt, va) - 1;
+		va_end(va);
+		return strbuilder_make_length(allocator, buf, res);
 	}
 
-	char const& operator [] ( ssize index ) const
-	{
-		return Data[ index ];
+	static
+	StrBuilder fmt_buf(AllocatorInfo allocator, char const* fmt, ...) {
+		local_persist thread_local
+		char buf[GEN_PRINTF_MAXLEN] = { 0 };
+		va_list va;
+		va_start(va, fmt);
+		ssize res = c_str_fmt_va(buf, GEN_PRINTF_MAXLEN, fmt, va) - 1;
+		va_end(va);
+		return strbuilder_make_length(allocator, buf, res);
 	}
 
-	char* Data;
+	FORCEINLINE bool              make_space_for(char const* str, ssize add_len) { return strbuilder_make_space_for(this, str, add_len); }
+	FORCEINLINE bool              append(char c)                                 { return strbuilder_append_char(this, c); }
+	FORCEINLINE bool              append(char const* str)                        { return strbuilder_append_c_str(this, str); }
+	FORCEINLINE bool              append(char const* str, ssize length)          { return strbuilder_append_c_str_len(this, str, length); }
+	FORCEINLINE bool              append(Str str)                                { return strbuilder_append_str(this, str); }
+	FORCEINLINE bool              append(const StrBuilder other)                 { return strbuilder_append_string(this, other); }
+	FORCEINLINE ssize             avail_space() const                            { return strbuilder_avail_space(* this); }
+	FORCEINLINE char*             back()                                         { return strbuilder_back(* this); }
+	FORCEINLINE bool              contains(Str substring) const                  { return strbuilder_contains_str(* this, substring); }
+	FORCEINLINE bool              contains(StrBuilder const& substring) const    { return strbuilder_contains_string(* this, substring); }
+	FORCEINLINE ssize             capacity() const                               { return strbuilder_capacity(* this); }
+	FORCEINLINE void              clear()                                        {        strbuilder_clear(* this); }
+	FORCEINLINE StrBuilder        duplicate(AllocatorInfo allocator) const       { return strbuilder_duplicate(* this, allocator); }
+	FORCEINLINE void              free()                                         {        strbuilder_free(this); }
+	FORCEINLINE bool              is_equal(StrBuilder const& other) const        { return strbuilder_are_equal(* this, other); }
+	FORCEINLINE bool              is_equal(Str other) const                      { return strbuilder_are_equal_str(* this, other); }
+	FORCEINLINE ssize             length() const                                 { return strbuilder_length(* this); }
+	FORCEINLINE b32               starts_with(Str substring) const               { return strbuilder_starts_with_str(* this, substring); }
+	FORCEINLINE b32               starts_with(StrBuilder substring) const        { return strbuilder_starts_with_string(* this, substring); }
+	FORCEINLINE void              skip_line()                                    {        strbuilder_skip_line(* this); }
+	FORCEINLINE void              strip_space()                                  {        strbuilder_strip_space(* this); }
+	FORCEINLINE Str               to_str()                                       { return { Data, strbuilder_length(*this) }; }
+	FORCEINLINE void              trim(char const* cut_set)                      {        strbuilder_trim(* this, cut_set); }
+	FORCEINLINE void              trim_space()                                   {        strbuilder_trim_space(* this); }
+	FORCEINLINE StrBuilder        visualize_whitespace() const                   { return strbuilder_visualize_whitespace(* this); }
+	FORCEINLINE StrBuilderHeader& get_header()                                   { return * strbuilder_get_header(* this); }
+
+	bool append_fmt(char const* fmt, ...) {
+		ssize res;
+		char buf[GEN_PRINTF_MAXLEN] = { 0 };
+
+		va_list va;
+		va_start(va, fmt);
+		res = c_str_fmt_va(buf, count_of(buf) - 1, fmt, va) - 1;
+		va_end(va);
+
+		return strbuilder_append_c_str_len(this, buf, res);
+	}
+#pragma endregion Member Mapping
+#endif
 };
+#endif
 
-struct String_POD
+FORCEINLINE char* strbuilder_begin(StrBuilder str)                   { return ((char*) str); }
+FORCEINLINE char* strbuilder_end  (StrBuilder str)                   { return ((char*) str + strbuilder_length(str)); }
+FORCEINLINE char* strbuilder_next (StrBuilder str, char const* iter) { return ((char*) iter + 1); }
+
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+FORCEINLINE char* begin(StrBuilder str)             { return ((char*) str); }
+FORCEINLINE char* end  (StrBuilder str)             { return ((char*) str + strbuilder_length(str)); }
+FORCEINLINE char* next (StrBuilder str, char* iter) { return ((char*) iter + 1); }
+#endif
+
+#if GEN_COMPILER_CPP && ! GEN_C_LIKE_CPP
+FORCEINLINE bool  make_space_for(StrBuilder& str, char const* to_append, ssize add_len);
+FORCEINLINE bool  append(StrBuilder& str, char c);
+FORCEINLINE bool  append(StrBuilder& str, char const* c_str_to_append);
+FORCEINLINE bool  append(StrBuilder& str, char const* c_str_to_append, ssize length);
+FORCEINLINE bool  append(StrBuilder& str, Str c_str_to_append);
+FORCEINLINE bool  append(StrBuilder& str, const StrBuilder other);
+FORCEINLINE bool  append_fmt(StrBuilder& str, char const* fmt, ...);
+FORCEINLINE char& back(StrBuilder& str);
+FORCEINLINE void  clear(StrBuilder& str);
+FORCEINLINE void  free(StrBuilder& str);
+#endif
+
+FORCEINLINE
+usize strbuilder_grow_formula(usize value) {
+	// Using a very aggressive growth formula to reduce time mem_copying with recursive calls to append in this library.
+	return 4 * value + 8;
+}
+
+FORCEINLINE
+StrBuilder strbuilder_make_c_str(AllocatorInfo allocator, char const* str) {
+	ssize length = str ? c_str_len(str) : 0;
+	return strbuilder_make_length(allocator, str, length);
+}
+
+FORCEINLINE
+StrBuilder strbuilder_make_str(AllocatorInfo allocator, Str str) {
+	return strbuilder_make_length(allocator, str.Ptr, str.Len);
+}
+
+inline
+StrBuilder strbuilder_fmt(AllocatorInfo allocator, char* buf, ssize buf_size, char const* fmt, ...) {
+	va_list va;
+	va_start(va, fmt);
+	ssize res = c_str_fmt_va(buf, buf_size, fmt, va) - 1;
+	va_end(va);
+
+	return strbuilder_make_length(allocator, buf, res);
+}
+
+inline
+StrBuilder strbuilder_fmt_buf(AllocatorInfo allocator, char const* fmt, ...)
 {
+	local_persist thread_local
+	PrintF_Buffer buf = struct_init(PrintF_Buffer, {0});
+
+	va_list va;
+	va_start(va, fmt);
+	ssize res = c_str_fmt_va(buf, GEN_PRINTF_MAXLEN, fmt, va) -1;
+	va_end(va);
+
+	return strbuilder_make_length(allocator, buf, res);
+}
+
+inline
+StrBuilder strbuilder_join(AllocatorInfo allocator, char const** parts, ssize num_parts, char const* glue)
+{
+	StrBuilder result = strbuilder_make_c_str(allocator, "");
+
+	for (ssize idx = 0; idx < num_parts; ++idx)
+	{
+		strbuilder_append_c_str(& result, parts[idx]);
+
+		if (idx < num_parts - 1)
+			strbuilder_append_c_str(& result, glue);
+	}
+
+	return result;
+}
+
+FORCEINLINE
+bool strbuilder_append_char(StrBuilder* str, char c) {
+	GEN_ASSERT(str != nullptr);
+	return strbuilder_append_c_str_len( str, (char const*)& c, (ssize)1);
+}
+
+FORCEINLINE
+bool strbuilder_append_c_str(StrBuilder* str, char const* c_str_to_append) {
+	GEN_ASSERT(str != nullptr);
+	return strbuilder_append_c_str_len(str, c_str_to_append, c_str_len(c_str_to_append));
+}
+
+inline
+bool strbuilder_append_c_str_len(StrBuilder* str, char const* c_str_to_append, ssize append_length)
+{
+	GEN_ASSERT(str != nullptr);
+	if ( rcast(sptr, c_str_to_append) > 0)
+	{
+		ssize curr_len = strbuilder_length(* str);
+
+		if ( ! strbuilder_make_space_for(str, c_str_to_append, append_length))
+			return false;
+
+		StrBuilderHeader* header = strbuilder_get_header(* str);
+
+		char* Data = * str;
+		mem_copy( Data + curr_len, c_str_to_append, append_length);
+
+		Data[curr_len + append_length] = '\0';
+
+		header->Length = curr_len + append_length;
+	}
+	return c_str_to_append != nullptr;
+}
+
+FORCEINLINE
+bool strbuilder_append_str(StrBuilder* str, Str c_str_to_append) {
+	GEN_ASSERT(str != nullptr);
+	return strbuilder_append_c_str_len(str, c_str_to_append.Ptr, c_str_to_append.Len);
+}
+
+FORCEINLINE
+bool strbuilder_append_string(StrBuilder* str, StrBuilder const other) {
+	GEN_ASSERT(str != nullptr);
+	return strbuilder_append_c_str_len(str, (char const*)other, strbuilder_length(other));
+}
+
+bool strbuilder_append_fmt(StrBuilder* str, char const* fmt, ...) {
+	GEN_ASSERT(str != nullptr);
+	ssize res;
+	char buf[GEN_PRINTF_MAXLEN] = { 0 };
+
+	va_list va;
+	va_start(va, fmt);
+	res = c_str_fmt_va(buf, count_of(buf) - 1, fmt, va) - 1;
+	va_end(va);
+
+	return strbuilder_append_c_str_len(str, (char const*)buf, res);
+}
+
+inline
+bool strbuilder_are_equal_string(StrBuilder const lhs, StrBuilder const rhs)
+{
+	if (strbuilder_length(lhs) != strbuilder_length(rhs))
+		return false;
+
+	for (ssize idx = 0; idx < strbuilder_length(lhs); ++idx)
+		if (lhs[idx] != rhs[idx])
+			return false;
+
+	return true;
+}
+
+inline
+bool strbuilder_are_equal_str(StrBuilder const lhs, Str rhs)
+{
+	if (strbuilder_length(lhs) != (rhs.Len))
+		return false;
+
+	for (ssize idx = 0; idx < strbuilder_length(lhs); ++idx)
+		if (lhs[idx] != rhs.Ptr[idx])
+			return false;
+
+	return true;
+}
+
+FORCEINLINE
+ssize strbuilder_avail_space(StrBuilder const str) {
+	StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
+	return header->Capacity - header->Length;
+}
+
+FORCEINLINE
+char* strbuilder_back(StrBuilder str) {
+	return & (str)[strbuilder_length(str) - 1];
+}
+
+inline
+bool strbuilder_contains_StrC(StrBuilder const str, Str substring)
+{
+	StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
+
+	if (substring.Len > header->Length)
+		return false;
+
+	ssize main_len = header->Length;
+	ssize sub_len  = substring.Len;
+
+	for (ssize idx = 0; idx <= main_len - sub_len; ++idx)
+	{
+		if (c_str_compare_len(str + idx, substring.Ptr, sub_len) == 0)
+			return true;
+	}
+
+	return false;
+}
+
+inline
+bool strbuilder_contains_string(StrBuilder const str, StrBuilder const substring)
+{
+	StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
+
+	if (strbuilder_length(substring) > header->Length)
+		return false;
+
+	ssize main_len = header->Length;
+	ssize sub_len  = strbuilder_length(substring);
+
+	for (ssize idx = 0; idx <= main_len - sub_len; ++idx)
+	{
+		if (c_str_compare_len(str + idx, substring, sub_len) == 0)
+			return true;
+	}
+
+	return false;
+}
+
+FORCEINLINE
+ssize strbuilder_capacity(StrBuilder const str) {
+	StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
+	return header->Capacity;
+}
+
+FORCEINLINE
+void strbuilder_clear(StrBuilder str) {
+	strbuilder_get_header(str)->Length = 0;
+}
+
+FORCEINLINE
+StrBuilder strbuilder_duplicate(StrBuilder const str, AllocatorInfo allocator) {
+	return strbuilder_make_length(allocator, str, strbuilder_length(str));
+}
+
+FORCEINLINE
+void strbuilder_free(StrBuilder* str) {
+	GEN_ASSERT(str != nullptr);
+	if (! (* str))
+		return;
+
+	StrBuilderHeader* header = strbuilder_get_header(* str);
+	allocator_free(header->Allocator, header);
+}
+
+FORCEINLINE
+StrBuilderHeader* strbuilder_get_header(StrBuilder str) {
+	return (StrBuilderHeader*)(scast(char*, str) - sizeof(StrBuilderHeader));
+}
+
+FORCEINLINE
+ssize strbuilder_length(StrBuilder const str)
+{
+	StrBuilderHeader const* header = rcast(StrBuilderHeader const*, scast(char const*, str) - sizeof(StrBuilderHeader));
+	return header->Length;
+}
+
+inline
+bool strbuilder_make_space_for(StrBuilder* str, char const* to_append, ssize add_len)
+{
+	ssize available = strbuilder_avail_space(* str);
+
+	if (available >= add_len) {
+		return true;
+	}
+	else
+	{
+		ssize new_len, old_size, new_size;
+		void* ptr;
+		void* new_ptr;
+
+		AllocatorInfo allocator = strbuilder_get_header(* str)->Allocator;
+		StrBuilderHeader* header    = nullptr;
+
+		new_len  = strbuilder_grow_formula(strbuilder_length(* str) + add_len);
+		ptr      = strbuilder_get_header(* str);
+		old_size = size_of(StrBuilderHeader) + strbuilder_length(* str) + 1;
+		new_size = size_of(StrBuilderHeader) + new_len + 1;
+
+		new_ptr = resize(allocator, ptr, old_size, new_size);
+
+		if (new_ptr == nullptr)
+			return false;
+
+		header = rcast(StrBuilderHeader*, new_ptr);
+		header->Allocator = allocator;
+		header->Capacity  = new_len;
+
+		char** Data = rcast(char**, str);
+		* Data = rcast(char*, header + 1);
+
+		return true;
+	}
+}
+
+FORCEINLINE
+b32 strbuilder_starts_with_str(StrBuilder const str, Str substring) {
+	if (substring.Len > strbuilder_length(str))
+	return false;
+
+	b32 result = c_str_compare_len(str, substring.Ptr, substring.Len) == 0;
+	return result;
+}
+
+FORCEINLINE
+b32 strbuilder_starts_with_string(StrBuilder const str, StrBuilder substring) {
+	if (strbuilder_length(substring) > strbuilder_length(str))
+		return false;
+
+	b32 result = c_str_compare_len(str, substring, strbuilder_length(substring) - 1) == 0;
+	return result;
+}
+
+inline
+void strbuilder_skip_line(StrBuilder str)
+{
+#define current (*scanner)
+	char* scanner = str;
+	while (current != '\r' && current != '\n') {
+		++scanner;
+	}
+
+	s32 new_length = scanner - str;
+
+	if (current == '\r') {
+		new_length += 1;
+	}
+
+	mem_move((char*)str, scanner, new_length);
+
+	StrBuilderHeader* header = strbuilder_get_header(str);
+	header->Length = new_length;
+#undef current
+}
+
+inline
+void strbuilder_strip_space(StrBuilder str)
+{
+	char* write_pos = str;
+	char* read_pos  = str;
+
+	while (* read_pos)
+	{
+		if (! char_is_space(* read_pos))
+		{
+   			* write_pos = * read_pos;
+			write_pos++;
+		}
+		read_pos++;
+	}
+   write_pos[0] = '\0';  // Null-terminate the modified string
+
+	// Update the length if needed
+	strbuilder_get_header(str)->Length = write_pos - str;
+}
+
+FORCEINLINE
+Str strbuilder_to_str(StrBuilder str) {
+	Str result = { (char const*)str, strbuilder_length(str) };
+	return result;
+}
+
+inline
+void strbuilder_trim(StrBuilder str, char const* cut_set)
+{
+	ssize len = 0;
+
+	char* start_pos = str;
+	char* end_pos   = scast(char*, str) + strbuilder_length(str) - 1;
+
+	while (start_pos <= end_pos && char_first_occurence(cut_set, *start_pos))
+	start_pos++;
+
+	while (end_pos > start_pos && char_first_occurence(cut_set, *end_pos))
+	end_pos--;
+
+	len = scast(ssize, (start_pos > end_pos) ? 0 : ((end_pos - start_pos) + 1));
+
+	if (str != start_pos)
+		mem_move(str, start_pos, len);
+
+	str[len] = '\0';
+
+	strbuilder_get_header(str)->Length = len;
+}
+
+FORCEINLINE
+void strbuilder_trim_space(StrBuilder str) {
+	strbuilder_trim(str, " \t\r\n\v\f");
+}
+
+inline
+StrBuilder strbuilder_visualize_whitespace(StrBuilder const str)
+{
+	StrBuilderHeader* header = (StrBuilderHeader*)(scast(char const*, str) - sizeof(StrBuilderHeader));
+	StrBuilder        result = strbuilder_make_reserve(header->Allocator, strbuilder_length(str) * 2); // Assume worst case for space requirements.
+
+	for (char const* c = strbuilder_begin(str); c != strbuilder_end(str); c = strbuilder_next(str, c))
+	switch ( * c )
+	{
+		case ' ':
+			strbuilder_append_str(& result, txt("·"));
+		break;
+		case '\t':
+			strbuilder_append_str(& result, txt("→"));
+		break;
+		case '\n':
+			strbuilder_append_str(& result, txt("↵"));
+		break;
+		case '\r':
+			strbuilder_append_str(& result, txt("⏎"));
+		break;
+		case '\v':
+			strbuilder_append_str(& result, txt("⇕"));
+		break;
+		case '\f':
+			strbuilder_append_str(& result, txt("⌂"));
+		break;
+		default:
+			strbuilder_append_char(& result, * c);
+		break;
+	}
+
+	return result;
+}
+#pragma endregion StrBuilder
+
+#if GEN_COMPILER_CPP
+struct StrBuilder_POD {
 	char* Data;
 };
-static_assert( sizeof( String_POD ) == sizeof( String ), "String is not a POD" );
+static_assert( sizeof( StrBuilder_POD ) == sizeof( StrBuilder ), "StrBuilder is not a POD" );
+#endif
 
-// Implements basic string interning. Data structure is based off the ZPL Hashtable.
-using StringTable = HashTable<String const>;
+FORCEINLINE
+Str str_duplicate(Str str, AllocatorInfo allocator) {
+	Str result = strbuilder_to_str( strbuilder_make_length(allocator, str.Ptr, str.Len));
+	return result;
+}
+
+inline
+Str str_visualize_whitespace(Str str, AllocatorInfo allocator)
+{
+	StrBuilder result = strbuilder_make_reserve(allocator, str.Len * 2); // Assume worst case for space requirements.
+	for (char const* c = str_begin(str); c != str_end(str); c = str_next(str, c))
+	switch ( * c )
+	{
+		case ' ':
+			strbuilder_append_str(& result, txt("·"));
+		break;
+		case '\t':
+			strbuilder_append_str(& result, txt("→"));
+		break;
+		case '\n':
+			strbuilder_append_str(& result, txt("↵"));
+		break;
+		case '\r':
+			strbuilder_append_str(& result, txt("⏎"));
+		break;
+		case '\v':
+			strbuilder_append_str(& result, txt("⇕"));
+		break;
+		case '\f':
+			strbuilder_append_str(& result, txt("⌂"));
+		break;
+		default:
+			strbuilder_append_char(& result, * c);
+		break;
+}
+	return strbuilder_to_str(result);
+}
 
 // Represents strings cached with the string table.
 // Should never be modified, if changed string is desired, cache_string( str ) another.
-using StringCached = String const;
+typedef Str StrCached;
 
+// Implements basic string interning. Data structure is based off the ZPL Hashtable.
+typedef HashTable(StrCached) StringTable;
 #pragma endregion Strings
 
 #pragma region File Handling
 
-typedef u32 FileMode;
-
 enum FileModeFlag
 {
 	EFileMode_READ   = bit( 0 ),
@@ -2619,11 +3480,12 @@ union FileDescriptor
 	uptr  u;
 };
 
+typedef u32                   FileMode;
 typedef struct FileOperations FileOperations;
 
 #define GEN_FILE_OPEN_PROC( name )     FileError name( FileDescriptor* fd, FileOperations* ops, FileMode mode, char const* filename )
 #define GEN_FILE_READ_AT_PROC( name )  b32 name( FileDescriptor fd, void* buffer, ssize size, s64 offset, ssize* bytes_read, b32 stop_at_newline )
-#define GEN_FILE_WRITE_AT_PROC( name ) b32 name( FileDescriptor fd, void const* buffer, ssize size, s64 offset, ssize* bytes_written )
+#define GEN_FILE_WRITE_AT_PROC( name ) b32 name( FileDescriptor fd, mem_ptr_const buffer, ssize size, s64 offset, ssize* bytes_written )
 #define GEN_FILE_SEEK_PROC( name )     b32 name( FileDescriptor fd, s64 offset, SeekWhenceType whence, s64* new_offset )
 #define GEN_FILE_CLOSE_PROC( name )    void name( FileDescriptor fd )
 
@@ -2656,9 +3518,9 @@ struct DirInfo;
 
 struct DirEntry
 {
-	char const*     filename;
-	struct DirInfo* dir_info;
-	u8              type;
+	char const* filename;
+	DirInfo*    dir_info;
+	u8          type;
 };
 
 struct DirInfo
@@ -2668,7 +3530,7 @@ struct DirInfo
 
 	// Internals
 	char** filenames;    // zpl_array
-	String buf;
+	StrBuilder buf;
 };
 
 struct FileInfo
@@ -2757,6 +3619,7 @@ b32 file_read_at( FileInfo* file, void* buffer, ssize size, s64 offset );
 	*/
 b32 file_read_at_check( FileInfo* file, void* buffer, ssize size, s64 offset, ssize* bytes_read );
 
+typedef struct FileContents FileContents;
 struct FileContents
 {
 	AllocatorInfo allocator;
@@ -2764,8 +3627,8 @@ struct FileContents
 	ssize            size;
 };
 
-constexpr b32 zero_terminate    = true;
-constexpr b32 no_zero_terminate = false;
+constexpr b32 file_zero_terminate    = true;
+constexpr b32 file_no_zero_terminate = false;
 
 /**
 	* Reads the whole file contents
@@ -2839,6 +3702,8 @@ enum FileStreamFlags : u32
 	/* Clones the input buffer so you can write (zpl_file_write*) data into it. */
 	/* Since we work with a clone, the buffer size can dynamically grow as well. */
 	EFileStream_CLONE_WRITABLE = bit( 1 ),
+
+	EFileStream_UNDERLYING = GEN_U32_MAX,
 };
 
 /**
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/gen.hpp b/Project/Source/GasaEditor/GasaGen/gencpp/gen.hpp
index 0926260..a39dc17 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/gen.hpp
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/gen.hpp
@@ -11,6 +11,9 @@
 #   pragma clang diagnostic ignored "-Wunknown-pragmas"
 #	pragma clang diagnostic ignored "-Wvarargs"
 #	pragma clang diagnostic ignored "-Wunused-function"
+#	pragma clang diagnostic ignored "-Wbraced-scalar-init"
+#   pragma clang diagnostic ignored "-W#pragma-messages"
+#	pragma clang diagnostic ignored "-Wstatic-in-inline"
 #endif
 
 #ifdef __GNUC__
@@ -30,6 +33,20 @@
 	https://github.com/Ed94/gencpp
 
 	This is a variant intended for use with Unreal Engine 5
+	https://github.com/Ed94/gencpp  --------------------------------------------------------------.
+	|   _____                               _____ _                       _                        |
+	|  / ____)                             / ____} |                     | |                       |
+	| | / ___  ___ _ __   ___ _ __  _ __  | {___ | |__ _ _, __ _, ___  __| |                       |
+	| | |{_  |/ _ \ '_ \ / __} '_ l| '_ l `\___ \| __/ _` |/ _` |/ _ \/ _` |                       |
+	| | l__j | ___/ | | | {__; |+l } |+l | ____) | l| (_| | {_| | ___/ (_| |                       |
+	|  \_____|\___}_l |_|\___} ,__/| ,__/ (_____/ \__\__/_|\__, |\___}\__,_l                       |
+	|  Unreal Engine         | |   | |                      __} |                                  |
+	|                        l_l   l_l                     {___/                                   |
+	! ----------------------------------------------------------------------- VERSION: v0.20-Alpha |
+	! ============================================================================================ |
+	! WARNING: THIS IS AN ALPHA VERSION OF THE LIBRARY, USE AT YOUR OWN DISCRETION                 |
+	! NEVER DO CODE GENERATION WITHOUT AT LEAST HAVING CONTENT IN A CODEBASE UNDER VERSION CONTROL |
+	! ============================================================================================ /
 */
 #if ! defined(GEN_DONT_ENFORCE_GEN_TIME_GUARD) && ! defined(GEN_TIME)
 #	error Gen.hpp : GEN_TIME not defined
@@ -57,6 +74,22 @@ GEN_NS_BEGIN
 
 #pragma region Types
 
+/*
+ ________                                              __    __      ________
+|        \                                            |  \  |  \    |        \
+| ▓▓▓▓▓▓▓▓_______  __    __ ______ ____   _______     | ▓▓\ | ▓▓     \▓▓▓▓▓▓▓▓__    __  ______   ______   _______
+| ▓▓__   |       \|  \  |  \      \    \ /       \    | ▓▓▓\| ▓▓       | ▓▓  |  \  |  \/      \ /      \ /       \
+| ▓▓  \  | ▓▓▓▓▓▓▓\ ▓▓  | ▓▓ ▓▓▓▓▓▓\▓▓▓▓\  ▓▓▓▓▓▓▓    | ▓▓▓▓\ ▓▓       | ▓▓  | ▓▓  | ▓▓  ▓▓▓▓▓▓\  ▓▓▓▓▓▓\  ▓▓▓▓▓▓▓
+| ▓▓▓▓▓  | ▓▓  | ▓▓ ▓▓  | ▓▓ ▓▓ | ▓▓ | ▓▓\▓▓    \     | ▓▓\▓▓ ▓▓       | ▓▓  | ▓▓  | ▓▓ ▓▓  | ▓▓ ▓▓    ▓▓\▓▓    \
+| ▓▓_____| ▓▓  | ▓▓ ▓▓__/ ▓▓ ▓▓ | ▓▓ | ▓▓_\▓▓▓▓▓▓\    | ▓▓ \▓▓▓▓       | ▓▓  | ▓▓__/ ▓▓ ▓▓__/ ▓▓ ▓▓▓▓▓▓▓▓_\▓▓▓▓▓▓\
+| ▓▓     \ ▓▓  | ▓▓\▓▓    ▓▓ ▓▓ | ▓▓ | ▓▓       ▓▓    | ▓▓  \▓▓▓       | ▓▓   \▓▓    ▓▓ ▓▓    ▓▓\▓▓     \       ▓▓
+ \▓▓▓▓▓▓▓▓\▓▓   \▓▓ \▓▓▓▓▓▓ \▓▓  \▓▓  \▓▓\▓▓▓▓▓▓▓      \▓▓   \▓▓        \▓▓   _\▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓  \▓▓▓▓▓▓▓\▓▓▓▓▓▓▓
+                                                                             |  \__| ▓▓ ▓▓
+                                                                              \▓▓    ▓▓ ▓▓
+                                                                               \▓▓▓▓▓▓ \▓▓
+
+*/
+
 using LogFailType = ssize(*)(char const*, ...);
 
 // By default this library will either crash or exit if an error is detected while generating codes.
@@ -67,445 +100,1016 @@ using LogFailType = ssize(*)(char const*, ...);
 	#define log_failure GEN_FATAL
 #endif
 
-enum class AccessSpec : u32
+enum AccessSpec : u32
 {
-	Default,
-	Private,
-	Protected,
-	Public,
+	AccessSpec_Default,
+	AccessSpec_Private,
+	AccessSpec_Protected,
+	AccessSpec_Public,
 
-	Num_AccessSpec,
-	Invalid,
+	AccessSpec_Num_AccessSpec,
+	AccessSpec_Invalid,
+
+	AccessSpec_SizeDef = GEN_U32_MAX,
 };
+static_assert( size_of(AccessSpec) == size_of(u32), "AccessSpec not u32 size" );
 
 inline
-char const* to_str( AccessSpec type )
+Str access_spec_to_str( AccessSpec type )
 {
 	local_persist
-	char const* lookup[ (u32)AccessSpec::Num_AccessSpec ] = {
-		"",
-		"private",
-		"protected",
-		"public",
+	Str lookup[ (u32)AccessSpec_Num_AccessSpec ] = {
+		{ "",        sizeof( "" )        - 1 },
+		{ "private", sizeof("prviate")   - 1 },
+		{ "private", sizeof("protected") - 1 },
+		{ "public",  sizeof("public")    - 1 },
 	};
 
-	if ( type > AccessSpec::Public )
-		return "Invalid";
+	Str invalid = { "Invalid", sizeof("Invalid") - 1 };
+	if ( type > AccessSpec_Public )
+		return invalid;
 
 	return lookup[ (u32)type ];
 }
 
-
 enum CodeFlag : u32
 {
-	None          = 0,
-	FunctionType  = bit(0),
-	ParamPack     = bit(1),
-	Module_Export = bit(2),
-	Module_Import = bit(3),
+	CodeFlag_None          = 0,
+	CodeFlag_FunctionType  = bit(0),
+	CodeFlag_ParamPack     = bit(1),
+	CodeFlag_Module_Export = bit(2),
+	CodeFlag_Module_Import = bit(3),
+
+	CodeFlag_SizeDef = GEN_U32_MAX,
 };
+static_assert( size_of(CodeFlag) == size_of(u32), "CodeFlag not u32 size" );
 
 // Used to indicate if enum definitoin is an enum class or regular enum.
-enum class EnumT : u8
+enum EnumDecl : u8
 {
-	Regular,
-	Class
+	EnumDecl_Regular,
+	EnumDecl_Class,
+
+	EnumT_SizeDef = GEN_U8_MAX,
 };
+typedef u8 EnumT;
 
-constexpr EnumT EnumClass   = EnumT::Class;
-constexpr EnumT EnumRegular = EnumT::Regular;
-
-enum class ModuleFlag : u32
+enum ModuleFlag : u32
 {
-	None    = 0,
-	Export  = bit(0),
-	Import  = bit(1),
+	ModuleFlag_None    = 0,
+	ModuleFlag_Export  = bit(0),
+	ModuleFlag_Import  = bit(1),
 
 	Num_ModuleFlags,
-	Invalid,
+	ModuleFlag_Invalid,
+
+	ModuleFlag_SizeDef = GEN_U32_MAX,
 };
+static_assert( size_of(ModuleFlag) == size_of(u32), "ModuleFlag not u32 size" );
 
 inline
-StrC to_str( ModuleFlag flag )
+Str module_flag_to_str( ModuleFlag flag )
 {
 	local_persist
-	StrC lookup[ (u32)ModuleFlag::Num_ModuleFlags ] = {
-		{ sizeof("__none__"), "__none__" },
-		{ sizeof("export"), "export" },
-		{ sizeof("import"), "import" },
+	Str lookup[ (u32)Num_ModuleFlags ] = {
+		{ "__none__", sizeof("__none__") - 1 },
+		{ "export",   sizeof("export")   - 1 },
+		{ "import",   sizeof("import")   - 1 },
 	};
 
-	if ( flag > ModuleFlag::Import )
-		return { sizeof("invalid"), "invalid" };
+	local_persist
+	Str invalid_flag = { "invalid", sizeof("invalid") };
+	if ( flag > ModuleFlag_Import )
+		return invalid_flag;
 
 	return lookup[ (u32)flag ];
 }
 
-inline
-ModuleFlag operator|( ModuleFlag A, ModuleFlag B)
+enum EPreprocessCond : u32
 {
-	return (ModuleFlag)( (u32)A | (u32)B );
-}
+	PreprocessCond_If,
+	PreprocessCond_IfDef,
+	PreprocessCond_IfNotDef,
+	PreprocessCond_ElIf,
 
-enum class EPreprocessCond : u32
+	EPreprocessCond_SizeDef = GEN_U32_MAX,
+};
+static_assert( size_of(EPreprocessCond) == size_of(u32), "EPreprocessCond not u32 size" );
+
+enum ETypenameTag : u16
 {
-	If,
-	IfDef,
-	IfNotDef,
-	ElIf
+	Tag_None,
+	Tag_Class,
+	Tag_Enum,
+	Tag_Struct,
+	Tag_Union,
+
+	Tag_UnderlyingType = GEN_U16_MAX,
+};
+static_assert( size_of(ETypenameTag) == size_of(u16), "ETypenameTag is not u16 size");
+
+enum CodeType : u32
+{
+	CT_Invalid,
+	CT_Untyped,
+	CT_NewLine,
+	CT_Comment,
+	CT_Access_Private,
+	CT_Access_Protected,
+	CT_Access_Public,
+	CT_PlatformAttributes,
+	CT_Class,
+	CT_Class_Fwd,
+	CT_Class_Body,
+	CT_Constructor,
+	CT_Constructor_Fwd,
+	CT_Destructor,
+	CT_Destructor_Fwd,
+	CT_Enum,
+	CT_Enum_Fwd,
+	CT_Enum_Body,
+	CT_Enum_Class,
+	CT_Enum_Class_Fwd,
+	CT_Execution,
+	CT_Export_Body,
+	CT_Extern_Linkage,
+	CT_Extern_Linkage_Body,
+	CT_Friend,
+	CT_Function,
+	CT_Function_Fwd,
+	CT_Function_Body,
+	CT_Global_Body,
+	CT_Module,
+	CT_Namespace,
+	CT_Namespace_Body,
+	CT_Operator,
+	CT_Operator_Fwd,
+	CT_Operator_Member,
+	CT_Operator_Member_Fwd,
+	CT_Operator_Cast,
+	CT_Operator_Cast_Fwd,
+	CT_Parameters,
+	CT_Parameters_Define,
+	CT_Preprocess_Define,
+	CT_Preprocess_Include,
+	CT_Preprocess_If,
+	CT_Preprocess_IfDef,
+	CT_Preprocess_IfNotDef,
+	CT_Preprocess_ElIf,
+	CT_Preprocess_Else,
+	CT_Preprocess_EndIf,
+	CT_Preprocess_Pragma,
+	CT_Specifiers,
+	CT_Struct,
+	CT_Struct_Fwd,
+	CT_Struct_Body,
+	CT_Template,
+	CT_Typedef,
+	CT_Typename,
+	CT_Union,
+	CT_Union_Fwd,
+	CT_Union_Body,
+	CT_Using,
+	CT_Using_Namespace,
+	CT_Variable,
+	CT_NumTypes,
+	CT_UnderlyingType = GEN_U32_MAX
 };
 
-constexpr EPreprocessCond PreprocessCond_If       = EPreprocessCond::If;
-constexpr EPreprocessCond PreprocessCond_IfDef    = EPreprocessCond::IfDef;
-constexpr EPreprocessCond PreprocessCond_IfNotDef = EPreprocessCond::IfNotDef;
-constexpr EPreprocessCond PreprocessCond_ElIf     = EPreprocessCond::ElIf;
-
-namespace ECode
+inline Str codetype_to_str( CodeType type )
 {
-	enum Type : u32
-	{
-		Invalid,
-		Untyped,
-		NewLine,
-		Comment,
-		Access_Private,
-		Access_Protected,
-		Access_Public,
-		PlatformAttributes,
-		Class,
-		Class_Fwd,
-		Class_Body,
-		Constructor,
-		Constructor_Fwd,
-		Destructor,
-		Destructor_Fwd,
-		Enum,
-		Enum_Fwd,
-		Enum_Body,
-		Enum_Class,
-		Enum_Class_Fwd,
-		Execution,
-		Export_Body,
-		Extern_Linkage,
-		Extern_Linkage_Body,
-		Friend,
-		Function,
-		Function_Fwd,
-		Function_Body,
-		Global_Body,
-		Module,
-		Namespace,
-		Namespace_Body,
-		Operator,
-		Operator_Fwd,
-		Operator_Member,
-		Operator_Member_Fwd,
-		Operator_Cast,
-		Operator_Cast_Fwd,
-		Parameters,
-		Preprocess_Define,
-		Preprocess_Include,
-		Preprocess_If,
-		Preprocess_IfDef,
-		Preprocess_IfNotDef,
-		Preprocess_ElIf,
-		Preprocess_Else,
-		Preprocess_EndIf,
-		Preprocess_Pragma,
-		Specifiers,
-		Struct,
-		Struct_Fwd,
-		Struct_Body,
-		Template,
-		Typedef,
-		Typename,
-		Union,
-		Union_Body,
-		Using,
-		Using_Namespace,
-		Variable,
-		NumTypes
+	local_persist Str lookup[] = {
+		{ "Invalid",             sizeof( "Invalid" ) - 1             },
+		{ "Untyped",             sizeof( "Untyped" ) - 1             },
+		{ "NewLine",             sizeof( "NewLine" ) - 1             },
+		{ "Comment",             sizeof( "Comment" ) - 1             },
+		{ "Access_Private",      sizeof( "Access_Private" ) - 1      },
+		{ "Access_Protected",    sizeof( "Access_Protected" ) - 1    },
+		{ "Access_Public",       sizeof( "Access_Public" ) - 1       },
+		{ "PlatformAttributes",  sizeof( "PlatformAttributes" ) - 1  },
+		{ "Class",               sizeof( "Class" ) - 1               },
+		{ "Class_Fwd",           sizeof( "Class_Fwd" ) - 1           },
+		{ "Class_Body",          sizeof( "Class_Body" ) - 1          },
+		{ "Constructor",         sizeof( "Constructor" ) - 1         },
+		{ "Constructor_Fwd",     sizeof( "Constructor_Fwd" ) - 1     },
+		{ "Destructor",          sizeof( "Destructor" ) - 1          },
+		{ "Destructor_Fwd",      sizeof( "Destructor_Fwd" ) - 1      },
+		{ "Enum",                sizeof( "Enum" ) - 1                },
+		{ "Enum_Fwd",            sizeof( "Enum_Fwd" ) - 1            },
+		{ "Enum_Body",           sizeof( "Enum_Body" ) - 1           },
+		{ "Enum_Class",          sizeof( "Enum_Class" ) - 1          },
+		{ "Enum_Class_Fwd",      sizeof( "Enum_Class_Fwd" ) - 1      },
+		{ "Execution",           sizeof( "Execution" ) - 1           },
+		{ "Export_Body",         sizeof( "Export_Body" ) - 1         },
+		{ "Extern_Linkage",      sizeof( "Extern_Linkage" ) - 1      },
+		{ "Extern_Linkage_Body", sizeof( "Extern_Linkage_Body" ) - 1 },
+		{ "Friend",              sizeof( "Friend" ) - 1              },
+		{ "Function",            sizeof( "Function" ) - 1            },
+		{ "Function_Fwd",        sizeof( "Function_Fwd" ) - 1        },
+		{ "Function_Body",       sizeof( "Function_Body" ) - 1       },
+		{ "Global_Body",         sizeof( "Global_Body" ) - 1         },
+		{ "Module",              sizeof( "Module" ) - 1              },
+		{ "Namespace",           sizeof( "Namespace" ) - 1           },
+		{ "Namespace_Body",      sizeof( "Namespace_Body" ) - 1      },
+		{ "Operator",            sizeof( "Operator" ) - 1            },
+		{ "Operator_Fwd",        sizeof( "Operator_Fwd" ) - 1        },
+		{ "Operator_Member",     sizeof( "Operator_Member" ) - 1     },
+		{ "Operator_Member_Fwd", sizeof( "Operator_Member_Fwd" ) - 1 },
+		{ "Operator_Cast",       sizeof( "Operator_Cast" ) - 1       },
+		{ "Operator_Cast_Fwd",   sizeof( "Operator_Cast_Fwd" ) - 1   },
+		{ "Parameters",          sizeof( "Parameters" ) - 1          },
+		{ "Parameters_Define",   sizeof( "Parameters_Define" ) - 1   },
+		{ "Preprocess_Define",   sizeof( "Preprocess_Define" ) - 1   },
+		{ "Preprocess_Include",  sizeof( "Preprocess_Include" ) - 1  },
+		{ "Preprocess_If",       sizeof( "Preprocess_If" ) - 1       },
+		{ "Preprocess_IfDef",    sizeof( "Preprocess_IfDef" ) - 1    },
+		{ "Preprocess_IfNotDef", sizeof( "Preprocess_IfNotDef" ) - 1 },
+		{ "Preprocess_ElIf",     sizeof( "Preprocess_ElIf" ) - 1     },
+		{ "Preprocess_Else",     sizeof( "Preprocess_Else" ) - 1     },
+		{ "Preprocess_EndIf",    sizeof( "Preprocess_EndIf" ) - 1    },
+		{ "Preprocess_Pragma",   sizeof( "Preprocess_Pragma" ) - 1   },
+		{ "Specifiers",          sizeof( "Specifiers" ) - 1          },
+		{ "Struct",              sizeof( "Struct" ) - 1              },
+		{ "Struct_Fwd",          sizeof( "Struct_Fwd" ) - 1          },
+		{ "Struct_Body",         sizeof( "Struct_Body" ) - 1         },
+		{ "Template",            sizeof( "Template" ) - 1            },
+		{ "Typedef",             sizeof( "Typedef" ) - 1             },
+		{ "Typename",            sizeof( "Typename" ) - 1            },
+		{ "Union",               sizeof( "Union" ) - 1               },
+		{ "Union_Fwd",           sizeof( "Union_Fwd" ) - 1           },
+		{ "Union_Body",          sizeof( "Union_Body" ) - 1          },
+		{ "Using",               sizeof( "Using" ) - 1               },
+		{ "Using_Namespace",     sizeof( "Using_Namespace" ) - 1     },
+		{ "Variable",            sizeof( "Variable" ) - 1            },
 	};
+	return lookup[type];
+}
 
-	inline StrC to_str( Type type )
-	{
-		local_persist StrC lookup[] {
-			{ sizeof( "Invalid" ),             "Invalid"             },
-			{ sizeof( "Untyped" ),             "Untyped"             },
-			{ sizeof( "NewLine" ),             "NewLine"             },
-			{ sizeof( "Comment" ),             "Comment"             },
-			{ sizeof( "Access_Private" ),      "Access_Private"      },
-			{ sizeof( "Access_Protected" ),    "Access_Protected"    },
-			{ sizeof( "Access_Public" ),       "Access_Public"       },
-			{ sizeof( "PlatformAttributes" ),  "PlatformAttributes"  },
-			{ sizeof( "Class" ),               "Class"               },
-			{ sizeof( "Class_Fwd" ),           "Class_Fwd"           },
-			{ sizeof( "Class_Body" ),          "Class_Body"          },
-			{ sizeof( "Constructor" ),         "Constructor"         },
-			{ sizeof( "Constructor_Fwd" ),     "Constructor_Fwd"     },
-			{ sizeof( "Destructor" ),          "Destructor"          },
-			{ sizeof( "Destructor_Fwd" ),      "Destructor_Fwd"      },
-			{ sizeof( "Enum" ),                "Enum"                },
-			{ sizeof( "Enum_Fwd" ),            "Enum_Fwd"            },
-			{ sizeof( "Enum_Body" ),           "Enum_Body"           },
-			{ sizeof( "Enum_Class" ),          "Enum_Class"          },
-			{ sizeof( "Enum_Class_Fwd" ),      "Enum_Class_Fwd"      },
-			{ sizeof( "Execution" ),           "Execution"           },
-			{ sizeof( "Export_Body" ),         "Export_Body"         },
-			{ sizeof( "Extern_Linkage" ),      "Extern_Linkage"      },
-			{ sizeof( "Extern_Linkage_Body" ), "Extern_Linkage_Body" },
-			{ sizeof( "Friend" ),              "Friend"              },
-			{ sizeof( "Function" ),            "Function"            },
-			{ sizeof( "Function_Fwd" ),        "Function_Fwd"        },
-			{ sizeof( "Function_Body" ),       "Function_Body"       },
-			{ sizeof( "Global_Body" ),         "Global_Body"         },
-			{ sizeof( "Module" ),              "Module"              },
-			{ sizeof( "Namespace" ),           "Namespace"           },
-			{ sizeof( "Namespace_Body" ),      "Namespace_Body"      },
-			{ sizeof( "Operator" ),            "Operator"            },
-			{ sizeof( "Operator_Fwd" ),        "Operator_Fwd"        },
-			{ sizeof( "Operator_Member" ),     "Operator_Member"     },
-			{ sizeof( "Operator_Member_Fwd" ), "Operator_Member_Fwd" },
-			{ sizeof( "Operator_Cast" ),       "Operator_Cast"       },
-			{ sizeof( "Operator_Cast_Fwd" ),   "Operator_Cast_Fwd"   },
-			{ sizeof( "Parameters" ),          "Parameters"          },
-			{ sizeof( "Preprocess_Define" ),   "Preprocess_Define"   },
-			{ sizeof( "Preprocess_Include" ),  "Preprocess_Include"  },
-			{ sizeof( "Preprocess_If" ),       "Preprocess_If"       },
-			{ sizeof( "Preprocess_IfDef" ),    "Preprocess_IfDef"    },
-			{ sizeof( "Preprocess_IfNotDef" ), "Preprocess_IfNotDef" },
-			{ sizeof( "Preprocess_ElIf" ),     "Preprocess_ElIf"     },
-			{ sizeof( "Preprocess_Else" ),     "Preprocess_Else"     },
-			{ sizeof( "Preprocess_EndIf" ),    "Preprocess_EndIf"    },
-			{ sizeof( "Preprocess_Pragma" ),   "Preprocess_Pragma"   },
-			{ sizeof( "Specifiers" ),          "Specifiers"          },
-			{ sizeof( "Struct" ),              "Struct"              },
-			{ sizeof( "Struct_Fwd" ),          "Struct_Fwd"          },
-			{ sizeof( "Struct_Body" ),         "Struct_Body"         },
-			{ sizeof( "Template" ),            "Template"            },
-			{ sizeof( "Typedef" ),             "Typedef"             },
-			{ sizeof( "Typename" ),            "Typename"            },
-			{ sizeof( "Union" ),               "Union"               },
-			{ sizeof( "Union_Body" ),          "Union_Body"          },
-			{ sizeof( "Using" ),               "Using"               },
-			{ sizeof( "Using_Namespace" ),     "Using_Namespace"     },
-			{ sizeof( "Variable" ),            "Variable"            },
-		};
-		return lookup[type];
-	}
-
-}    // namespace ECode
-
-using CodeT = ECode::Type;
-
-namespace EOperator
+inline Str codetype_to_keyword_str( CodeType type )
 {
-	enum Type : u32
-	{
-		Invalid,
-		Assign,
-		Assign_Add,
-		Assign_Subtract,
-		Assign_Multiply,
-		Assign_Divide,
-		Assign_Modulo,
-		Assign_BAnd,
-		Assign_BOr,
-		Assign_BXOr,
-		Assign_LShift,
-		Assign_RShift,
-		Increment,
-		Decrement,
-		Unary_Plus,
-		Unary_Minus,
-		UnaryNot,
-		Add,
-		Subtract,
-		Multiply,
-		Divide,
-		Modulo,
-		BNot,
-		BAnd,
-		BOr,
-		BXOr,
-		LShift,
-		RShift,
-		LAnd,
-		LOr,
-		LEqual,
-		LNot,
-		Lesser,
-		Greater,
-		LesserEqual,
-		GreaterEqual,
-		Subscript,
-		Indirection,
-		AddressOf,
-		MemberOfPointer,
-		PtrToMemOfPtr,
-		FunctionCall,
-		Comma,
-		New,
-		NewArray,
-		Delete,
-		DeleteArray,
-		NumOps
+	local_persist Str lookup[] = {
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "//",              sizeof( "//" ) - 1              },
+		{ "private",         sizeof( "private" ) - 1         },
+		{ "protected",       sizeof( "protected" ) - 1       },
+		{ "public",          sizeof( "public" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "class",           sizeof( "class" ) - 1           },
+		{ "clsss",           sizeof( "clsss" ) - 1           },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "enum",            sizeof( "enum" ) - 1            },
+		{ "enum",            sizeof( "enum" ) - 1            },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "enum class",      sizeof( "enum class" ) - 1      },
+		{ "enum class",      sizeof( "enum class" ) - 1      },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "extern",          sizeof( "extern" ) - 1          },
+		{ "extern",          sizeof( "extern" ) - 1          },
+		{ "friend",          sizeof( "friend" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "module",          sizeof( "module" ) - 1          },
+		{ "namespace",       sizeof( "namespace" ) - 1       },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "operator",        sizeof( "operator" ) - 1        },
+		{ "operator",        sizeof( "operator" ) - 1        },
+		{ "operator",        sizeof( "operator" ) - 1        },
+		{ "operator",        sizeof( "operator" ) - 1        },
+		{ "operator",        sizeof( "operator" ) - 1        },
+		{ "operator",        sizeof( "operator" ) - 1        },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "define",          sizeof( "define" ) - 1          },
+		{ "include",         sizeof( "include" ) - 1         },
+		{ "if",              sizeof( "if" ) - 1              },
+		{ "ifdef",           sizeof( "ifdef" ) - 1           },
+		{ "ifndef",          sizeof( "ifndef" ) - 1          },
+		{ "elif",            sizeof( "elif" ) - 1            },
+		{ "else",            sizeof( "else" ) - 1            },
+		{ "endif",           sizeof( "endif" ) - 1           },
+		{ "pragma",          sizeof( "pragma" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "struct",          sizeof( "struct" ) - 1          },
+		{ "struct",          sizeof( "struct" ) - 1          },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "template",        sizeof( "template" ) - 1        },
+		{ "typedef",         sizeof( "typedef" ) - 1         },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "union",           sizeof( "union" ) - 1           },
+		{ "union",           sizeof( "union" ) - 1           },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
+		{ "using",           sizeof( "using" ) - 1           },
+		{ "using namespace", sizeof( "using namespace" ) - 1 },
+		{ "__NA__",          sizeof( "__NA__" ) - 1          },
 	};
+	return lookup[type];
+}
 
-	inline StrC to_str( Type op )
-	{
-		local_persist StrC lookup[] {
-			{ sizeof( "INVALID" ),  "INVALID"  },
-			{ sizeof( "=" ),        "="        },
-			{ sizeof( "+=" ),       "+="       },
-			{ sizeof( "-=" ),       "-="       },
-			{ sizeof( "*=" ),       "*="       },
-			{ sizeof( "/=" ),       "/="       },
-			{ sizeof( "%=" ),       "%="       },
-			{ sizeof( "&=" ),       "&="       },
-			{ sizeof( "|=" ),       "|="       },
-			{ sizeof( "^=" ),       "^="       },
-			{ sizeof( "<<=" ),      "<<="      },
-			{ sizeof( ">>=" ),      ">>="      },
-			{ sizeof( "++" ),       "++"       },
-			{ sizeof( "--" ),       "--"       },
-			{ sizeof( "+" ),        "+"        },
-			{ sizeof( "-" ),        "-"        },
-			{ sizeof( "!" ),        "!"        },
-			{ sizeof( "+" ),        "+"        },
-			{ sizeof( "-" ),        "-"        },
-			{ sizeof( "*" ),        "*"        },
-			{ sizeof( "/" ),        "/"        },
-			{ sizeof( "%" ),        "%"        },
-			{ sizeof( "~" ),        "~"        },
-			{ sizeof( "&" ),        "&"        },
-			{ sizeof( "|" ),        "|"        },
-			{ sizeof( "^" ),        "^"        },
-			{ sizeof( "<<" ),       "<<"       },
-			{ sizeof( ">>" ),       ">>"       },
-			{ sizeof( "&&" ),       "&&"       },
-			{ sizeof( "||" ),       "||"       },
-			{ sizeof( "==" ),       "=="       },
-			{ sizeof( "!=" ),       "!="       },
-			{ sizeof( "<" ),        "<"        },
-			{ sizeof( ">" ),        ">"        },
-			{ sizeof( "<=" ),       "<="       },
-			{ sizeof( ">=" ),       ">="       },
-			{ sizeof( "[]" ),       "[]"       },
-			{ sizeof( "*" ),        "*"        },
-			{ sizeof( "&" ),        "&"        },
-			{ sizeof( "->" ),       "->"       },
-			{ sizeof( "->*" ),      "->*"      },
-			{ sizeof( "()" ),       "()"       },
-			{ sizeof( "," ),        ","        },
-			{ sizeof( "new" ),      "new"      },
-			{ sizeof( "new[]" ),    "new[]"    },
-			{ sizeof( "delete" ),   "delete"   },
-			{ sizeof( "delete[]" ), "delete[]" },
-		};
-		return lookup[op];
-	}
-
-}    // namespace EOperator
-
-using OperatorT = EOperator::Type;
-
-namespace ESpecifier
+FORCEINLINE Str to_str( CodeType type )
 {
-	enum Type : u32
-	{
-		Invalid,
-		Consteval,
-		Constexpr,
-		Constinit,
-		Explicit,
-		External_Linkage,
-		ForceInline,
-		Global,
-		Inline,
-		Internal_Linkage,
-		Local_Persist,
-		Mutable,
-		NeverInline,
-		Ptr,
-		Ref,
-		Register,
-		RValue,
-		Static,
-		Thread_Local,
-		Virtual,
-		Const,
-		Final,
-		NoExceptions,
-		Override,
-		Pure,
-		Volatile,
-		NumSpecifiers
+	return codetype_to_str( type );
+}
+
+FORCEINLINE Str to_keyword_str( CodeType type )
+{
+	return codetype_to_keyword_str( type );
+}
+
+enum Operator : u32
+{
+	Op_Invalid,
+	Op_Assign,
+	Op_Assign_Add,
+	Op_Assign_Subtract,
+	Op_Assign_Multiply,
+	Op_Assign_Divide,
+	Op_Assign_Modulo,
+	Op_Assign_BAnd,
+	Op_Assign_BOr,
+	Op_Assign_BXOr,
+	Op_Assign_LShift,
+	Op_Assign_RShift,
+	Op_Increment,
+	Op_Decrement,
+	Op_Unary_Plus,
+	Op_Unary_Minus,
+	Op_UnaryNot,
+	Op_Add,
+	Op_Subtract,
+	Op_Multiply,
+	Op_Divide,
+	Op_Modulo,
+	Op_BNot,
+	Op_BAnd,
+	Op_BOr,
+	Op_BXOr,
+	Op_LShift,
+	Op_RShift,
+	Op_LAnd,
+	Op_LOr,
+	Op_LEqual,
+	Op_LNot,
+	Op_Lesser,
+	Op_Greater,
+	Op_LesserEqual,
+	Op_GreaterEqual,
+	Op_Subscript,
+	Op_Indirection,
+	Op_AddressOf,
+	Op_MemberOfPointer,
+	Op_PtrToMemOfPtr,
+	Op_FunctionCall,
+	Op_Comma,
+	Op_New,
+	Op_NewArray,
+	Op_Delete,
+	Op_DeleteArray,
+	Op_NumOps,
+	Op_UnderlyingType = 0xffffffffu
+};
+
+inline Str operator_to_str( Operator op )
+{
+	local_persist Str lookup[] = {
+		{ "INVALID",  sizeof( "INVALID" ) - 1  },
+		{ "=",        sizeof( "=" ) - 1        },
+		{ "+=",       sizeof( "+=" ) - 1       },
+		{ "-=",       sizeof( "-=" ) - 1       },
+		{ "*=",       sizeof( "*=" ) - 1       },
+		{ "/=",       sizeof( "/=" ) - 1       },
+		{ "%=",       sizeof( "%=" ) - 1       },
+		{ "&=",       sizeof( "&=" ) - 1       },
+		{ "|=",       sizeof( "|=" ) - 1       },
+		{ "^=",       sizeof( "^=" ) - 1       },
+		{ "<<=",      sizeof( "<<=" ) - 1      },
+		{ ">>=",      sizeof( ">>=" ) - 1      },
+		{ "++",       sizeof( "++" ) - 1       },
+		{ "--",       sizeof( "--" ) - 1       },
+		{ "+",        sizeof( "+" ) - 1        },
+		{ "-",        sizeof( "-" ) - 1        },
+		{ "!",        sizeof( "!" ) - 1        },
+		{ "+",        sizeof( "+" ) - 1        },
+		{ "-",        sizeof( "-" ) - 1        },
+		{ "*",        sizeof( "*" ) - 1        },
+		{ "/",        sizeof( "/" ) - 1        },
+		{ "%",        sizeof( "%" ) - 1        },
+		{ "~",        sizeof( "~" ) - 1        },
+		{ "&",        sizeof( "&" ) - 1        },
+		{ "|",        sizeof( "|" ) - 1        },
+		{ "^",        sizeof( "^" ) - 1        },
+		{ "<<",       sizeof( "<<" ) - 1       },
+		{ ">>",       sizeof( ">>" ) - 1       },
+		{ "&&",       sizeof( "&&" ) - 1       },
+		{ "||",       sizeof( "||" ) - 1       },
+		{ "==",       sizeof( "==" ) - 1       },
+		{ "!=",       sizeof( "!=" ) - 1       },
+		{ "<",        sizeof( "<" ) - 1        },
+		{ ">",        sizeof( ">" ) - 1        },
+		{ "<=",       sizeof( "<=" ) - 1       },
+		{ ">=",       sizeof( ">=" ) - 1       },
+		{ "[]",       sizeof( "[]" ) - 1       },
+		{ "*",        sizeof( "*" ) - 1        },
+		{ "&",        sizeof( "&" ) - 1        },
+		{ "->",       sizeof( "->" ) - 1       },
+		{ "->*",      sizeof( "->*" ) - 1      },
+		{ "()",       sizeof( "()" ) - 1       },
+		{ ",",        sizeof( "," ) - 1        },
+		{ "new",      sizeof( "new" ) - 1      },
+		{ "new[]",    sizeof( "new[]" ) - 1    },
+		{ "delete",   sizeof( "delete" ) - 1   },
+		{ "delete[]", sizeof( "delete[]" ) - 1 },
 	};
+	return lookup[op];
+}
 
-	inline bool is_trailing( Type specifier )
+FORCEINLINE Str to_str( Operator op )
+{
+	return operator_to_str( op );
+}
+
+enum Specifier : u32
+{
+	Spec_Invalid,
+	Spec_Consteval,
+	Spec_Constexpr,
+	Spec_Constinit,
+	Spec_Explicit,
+	Spec_External_Linkage,
+	Spec_ForceInline,
+	Spec_ForceInline_Debuggable,
+	Spec_Global,
+	Spec_Inline,
+	Spec_Internal_Linkage,
+	Spec_Local_Persist,
+	Spec_Mutable,
+	Spec_NeverInline,
+	Spec_Ptr,
+	Spec_Ref,
+	Spec_Register,
+	Spec_RValue,
+	Spec_Static,
+	Spec_Thread_Local,
+	Spec_Virtual,
+	Spec_Const,
+	Spec_Final,
+	Spec_NoExceptions,
+	Spec_Override,
+	Spec_Pure,
+	Spec_Volatile,
+	Spec_NumSpecifiers,
+	Spec_UnderlyingType = 0xffffffffu
+};
+
+inline Str spec_to_str( Specifier type )
+{
+	local_persist Str lookup[] = {
+		{ "INVALID",                sizeof( "INVALID" ) - 1                },
+		{ "consteval",              sizeof( "consteval" ) - 1              },
+		{ "constexpr",              sizeof( "constexpr" ) - 1              },
+		{ "constinit",              sizeof( "constinit" ) - 1              },
+		{ "explicit",               sizeof( "explicit" ) - 1               },
+		{ "extern",                 sizeof( "extern" ) - 1                 },
+		{ "FORCEINLINE",            sizeof( "FORCEINLINE" ) - 1            },
+		{ "FORCEINLINE_DEBUGGABLE", sizeof( "FORCEINLINE_DEBUGGABLE" ) - 1 },
+		{ "global",                 sizeof( "global" ) - 1                 },
+		{ "inline",                 sizeof( "inline" ) - 1                 },
+		{ "internal",               sizeof( "internal" ) - 1               },
+		{ "local_persist",          sizeof( "local_persist" ) - 1          },
+		{ "mutable",                sizeof( "mutable" ) - 1                },
+		{ "neverinline",            sizeof( "neverinline" ) - 1            },
+		{ "*",		              sizeof( "*" ) - 1                      },
+		{ "&",		              sizeof( "&" ) - 1                      },
+		{ "register",               sizeof( "register" ) - 1               },
+		{ "&&",		             sizeof( "&&" ) - 1                     },
+		{ "static",                 sizeof( "static" ) - 1                 },
+		{ "thread_local",           sizeof( "thread_local" ) - 1           },
+		{ "virtual",                sizeof( "virtual" ) - 1                },
+		{ "const",                  sizeof( "const" ) - 1                  },
+		{ "final",                  sizeof( "final" ) - 1                  },
+		{ "noexcept",               sizeof( "noexcept" ) - 1               },
+		{ "override",               sizeof( "override" ) - 1               },
+		{ "= 0",		            sizeof( "= 0" ) - 1                    },
+		{ "volatile",               sizeof( "volatile" ) - 1               },
+	};
+	return lookup[type];
+}
+
+inline bool spec_is_trailing( Specifier specifier )
+{
+	return specifier > Spec_Virtual;
+}
+
+inline Specifier str_to_specifier( Str str )
+{
+	local_persist u32 keymap[Spec_NumSpecifiers];
+	do_once_start for ( u32 index = 0; index < Spec_NumSpecifiers; index++ )
 	{
-		return specifier > Virtual;
+		Str enum_str  = spec_to_str( (Specifier)index );
+		keymap[index] = crc32( enum_str.Ptr, enum_str.Len );
 	}
-
-	inline StrC to_str( Type type )
+	do_once_end u32 hash = crc32( str.Ptr, str.Len );
+	for ( u32 index = 0; index < Spec_NumSpecifiers; index++ )
 	{
-		local_persist StrC lookup[] {
-			{ sizeof( "INVALID" ),       "INVALID"       },
-			{ sizeof( "consteval" ),     "consteval"     },
-			{ sizeof( "constexpr" ),     "constexpr"     },
-			{ sizeof( "constinit" ),     "constinit"     },
-			{ sizeof( "explicit" ),      "explicit"      },
-			{ sizeof( "extern" ),        "extern"        },
-			{ sizeof( "FORCEINLINE" ),   "FORCEINLINE"   },
-			{ sizeof( "global" ),        "global"        },
-			{ sizeof( "inline" ),        "inline"        },
-			{ sizeof( "internal" ),      "internal"      },
-			{ sizeof( "local_persist" ), "local_persist" },
-			{ sizeof( "mutable" ),       "mutable"       },
-			{ sizeof( "neverinline" ),   "neverinline"   },
-			{ sizeof( "*" ),             "*"             },
-			{ sizeof( "&" ),             "&"             },
-			{ sizeof( "register" ),      "register"      },
-			{ sizeof( "&&" ),            "&&"            },
-			{ sizeof( "static" ),        "static"        },
-			{ sizeof( "thread_local" ),  "thread_local"  },
-			{ sizeof( "virtual" ),       "virtual"       },
-			{ sizeof( "const" ),         "const"         },
-			{ sizeof( "final" ),         "final"         },
-			{ sizeof( "noexcept" ),      "noexcept"      },
-			{ sizeof( "override" ),      "override"      },
-			{ sizeof( "= 0" ),           "= 0"           },
-			{ sizeof( "volatile" ),      "volatile"      },
-		};
-		return lookup[type];
+		if ( keymap[index] == hash )
+			return (Specifier)index;
 	}
+	return Spec_Invalid;
+}
 
-	inline Type to_type( StrC str )
+FORCEINLINE Str to_str( Specifier spec )
+{
+	return spec_to_str( spec );
+}
+
+FORCEINLINE Specifier to_type( Str str )
+{
+	return str_to_specifier( str );
+}
+
+FORCEINLINE bool is_trailing( Specifier specifier )
+{
+	return spec_is_trailing( specifier );
+}
+
+#define GEN_DEFINE_ATTRIBUTE_TOKENS                                                                                   \
+	Entry( Tok_Attribute_API_Export, "GEN_API_Export_Code" ) Entry( Tok_Attribute_API_Import, "GEN_API_Import_Code" ) \
+	    Entry( Tok_Attribute_COREUOBJECT_API, "COREUOBJECT_API" ) Entry( Tok_Attribute_ENGINE_API, "ENGINE_API" )     \
+	        Entry( Tok_Attribute_GAMEPLAYABILITIES_API, "GAMEPLAYABILITIES_API" ) Entry( Tok_Attribute_UMG_API, "UMG_API" )
+
+enum TokType : u32
+{
+	Tok_Invalid,
+	Tok_Access_Private,
+	Tok_Access_Protected,
+	Tok_Access_Public,
+	Tok_Access_MemberSymbol,
+	Tok_Access_StaticSymbol,
+	Tok_Ampersand,
+	Tok_Ampersand_DBL,
+	Tok_Assign_Classifer,
+	Tok_Attribute_Open,
+	Tok_Attribute_Close,
+	Tok_BraceCurly_Open,
+	Tok_BraceCurly_Close,
+	Tok_BraceSquare_Open,
+	Tok_BraceSquare_Close,
+	Tok_Capture_Start,
+	Tok_Capture_End,
+	Tok_Comment,
+	Tok_Comment_End,
+	Tok_Comment_Start,
+	Tok_Char,
+	Tok_Comma,
+	Tok_Decl_Class,
+	Tok_Decl_GNU_Attribute,
+	Tok_Decl_MSVC_Attribute,
+	Tok_Decl_Enum,
+	Tok_Decl_Extern_Linkage,
+	Tok_Decl_Friend,
+	Tok_Decl_Module,
+	Tok_Decl_Namespace,
+	Tok_Decl_Operator,
+	Tok_Decl_Struct,
+	Tok_Decl_Template,
+	Tok_Decl_Typedef,
+	Tok_Decl_Using,
+	Tok_Decl_Union,
+	Tok_Identifier,
+	Tok_Module_Import,
+	Tok_Module_Export,
+	Tok_NewLine,
+	Tok_Number,
+	Tok_Operator,
+	Tok_Preprocess_Hash,
+	Tok_Preprocess_Define,
+	Tok_Preprocess_Define_Param,
+	Tok_Preprocess_If,
+	Tok_Preprocess_IfDef,
+	Tok_Preprocess_IfNotDef,
+	Tok_Preprocess_ElIf,
+	Tok_Preprocess_Else,
+	Tok_Preprocess_EndIf,
+	Tok_Preprocess_Include,
+	Tok_Preprocess_Pragma,
+	Tok_Preprocess_Content,
+	Tok_Preprocess_Macro_Expr,
+	Tok_Preprocess_Macro_Stmt,
+	Tok_Preprocess_Macro_Typename,
+	Tok_Preprocess_Unsupported,
+	Tok_Spec_Alignas,
+	Tok_Spec_Const,
+	Tok_Spec_Consteval,
+	Tok_Spec_Constexpr,
+	Tok_Spec_Constinit,
+	Tok_Spec_Explicit,
+	Tok_Spec_Extern,
+	Tok_Spec_Final,
+	Tok_Spec_ForceInline,
+	Tok_Spec_ForceInline_Debuggable,
+	Tok_Spec_Global,
+	Tok_Spec_Inline,
+	Tok_Spec_Internal_Linkage,
+	Tok_Spec_LocalPersist,
+	Tok_Spec_Mutable,
+	Tok_Spec_NeverInline,
+	Tok_Spec_Override,
+	Tok_Spec_Static,
+	Tok_Spec_ThreadLocal,
+	Tok_Spec_Volatile,
+	Tok_Spec_Virtual,
+	Tok_Star,
+	Tok_Statement_End,
+	Tok_StaticAssert,
+	Tok_String,
+	Tok_Type_Typename,
+	Tok_Type_Unsigned,
+	Tok_Type_Signed,
+	Tok_Type_Short,
+	Tok_Type_Long,
+	Tok_Type_bool,
+	Tok_Type_char,
+	Tok_Type_int,
+	Tok_Type_double,
+	Tok_Type_MS_int8,
+	Tok_Type_MS_int16,
+	Tok_Type_MS_int32,
+	Tok_Type_MS_int64,
+	Tok_Type_MS_W64,
+	Tok_Varadic_Argument,
+	Tok___Attributes_Start,
+	Tok_Attribute_API_Export,
+	Tok_Attribute_API_Import,
+	Tok_Attribute_COREUOBJECT_API,
+	Tok_Attribute_ENGINE_API,
+	Tok_Attribute_GAMEPLAYABILITIES_API,
+	Tok_Attribute_UMG_API,
+	Tok_NumTokens
+};
+
+inline Str toktype_to_str( TokType type )
+{
+	local_persist Str lookup[] = {
+		{ "__invalid__",            sizeof( "__invalid__" ) - 1            },
+		{ "private",                sizeof( "private" ) - 1                },
+		{ "protected",              sizeof( "protected" ) - 1              },
+		{ "public",                 sizeof( "public" ) - 1                 },
+		{ ".",		              sizeof( "." ) - 1                      },
+		{ "::",		             sizeof( "::" ) - 1                     },
+		{ "&",		              sizeof( "&" ) - 1                      },
+		{ "&&",		             sizeof( "&&" ) - 1                     },
+		{ ":",		              sizeof( ":" ) - 1                      },
+		{ "[[",		             sizeof( "[[" ) - 1                     },
+		{ "]]",		             sizeof( "]]" ) - 1                     },
+		{ "{",		              sizeof( "{" ) - 1                      },
+		{ "}",		              sizeof( "}" ) - 1                      },
+		{ "[",		              sizeof( "[" ) - 1                      },
+		{ "]",		              sizeof( "]" ) - 1                      },
+		{ "(",		              sizeof( "(" ) - 1                      },
+		{ ")",		              sizeof( ")" ) - 1                      },
+		{ "__comment__",            sizeof( "__comment__" ) - 1            },
+		{ "__comment_end__",        sizeof( "__comment_end__" ) - 1        },
+		{ "__comment_start__",      sizeof( "__comment_start__" ) - 1      },
+		{ "__character__",          sizeof( "__character__" ) - 1          },
+		{ ",",		              sizeof( "," ) - 1                      },
+		{ "class",                  sizeof( "class" ) - 1                  },
+		{ "__attribute__",          sizeof( "__attribute__" ) - 1          },
+		{ "__declspec",             sizeof( "__declspec" ) - 1             },
+		{ "enum",		           sizeof( "enum" ) - 1                   },
+		{ "extern",                 sizeof( "extern" ) - 1                 },
+		{ "friend",                 sizeof( "friend" ) - 1                 },
+		{ "module",                 sizeof( "module" ) - 1                 },
+		{ "namespace",              sizeof( "namespace" ) - 1              },
+		{ "operator",               sizeof( "operator" ) - 1               },
+		{ "struct",                 sizeof( "struct" ) - 1                 },
+		{ "template",               sizeof( "template" ) - 1               },
+		{ "typedef",                sizeof( "typedef" ) - 1                },
+		{ "using",                  sizeof( "using" ) - 1                  },
+		{ "union",                  sizeof( "union" ) - 1                  },
+		{ "__identifier__",         sizeof( "__identifier__" ) - 1         },
+		{ "import",                 sizeof( "import" ) - 1                 },
+		{ "export",                 sizeof( "export" ) - 1                 },
+		{ "__new_line__",           sizeof( "__new_line__" ) - 1           },
+		{ "__number__",             sizeof( "__number__" ) - 1             },
+		{ "__operator__",           sizeof( "__operator__" ) - 1           },
+		{ "#",		              sizeof( "#" ) - 1                      },
+		{ "define",                 sizeof( "define" ) - 1                 },
+		{ "__define_param__",       sizeof( "__define_param__" ) - 1       },
+		{ "if",		             sizeof( "if" ) - 1                     },
+		{ "ifdef",                  sizeof( "ifdef" ) - 1                  },
+		{ "ifndef",                 sizeof( "ifndef" ) - 1                 },
+		{ "elif",		           sizeof( "elif" ) - 1                   },
+		{ "else",		           sizeof( "else" ) - 1                   },
+		{ "endif",                  sizeof( "endif" ) - 1                  },
+		{ "include",                sizeof( "include" ) - 1                },
+		{ "pragma",                 sizeof( "pragma" ) - 1                 },
+		{ "__macro_content__",      sizeof( "__macro_content__" ) - 1      },
+		{ "__macro_expression__",   sizeof( "__macro_expression__" ) - 1   },
+		{ "__macro_statment__",     sizeof( "__macro_statment__" ) - 1     },
+		{ "__macro_typename__",     sizeof( "__macro_typename__" ) - 1     },
+		{ "__unsupported__",        sizeof( "__unsupported__" ) - 1        },
+		{ "alignas",                sizeof( "alignas" ) - 1                },
+		{ "const",                  sizeof( "const" ) - 1                  },
+		{ "consteval",              sizeof( "consteval" ) - 1              },
+		{ "constexpr",              sizeof( "constexpr" ) - 1              },
+		{ "constinit",              sizeof( "constinit" ) - 1              },
+		{ "explicit",               sizeof( "explicit" ) - 1               },
+		{ "extern",                 sizeof( "extern" ) - 1                 },
+		{ "final",                  sizeof( "final" ) - 1                  },
+		{ "FORCEINLINE",            sizeof( "FORCEINLINE" ) - 1            },
+		{ "FORCEINLINE_DEBUGGABLE", sizeof( "FORCEINLINE_DEBUGGABLE" ) - 1 },
+		{ "global",                 sizeof( "global" ) - 1                 },
+		{ "inline",                 sizeof( "inline" ) - 1                 },
+		{ "internal",               sizeof( "internal" ) - 1               },
+		{ "local_persist",          sizeof( "local_persist" ) - 1          },
+		{ "mutable",                sizeof( "mutable" ) - 1                },
+		{ "neverinline",            sizeof( "neverinline" ) - 1            },
+		{ "override",               sizeof( "override" ) - 1               },
+		{ "static",                 sizeof( "static" ) - 1                 },
+		{ "thread_local",           sizeof( "thread_local" ) - 1           },
+		{ "volatile",               sizeof( "volatile" ) - 1               },
+		{ "virtual",                sizeof( "virtual" ) - 1                },
+		{ "*",		              sizeof( "*" ) - 1                      },
+		{ ";",		              sizeof( ";" ) - 1                      },
+		{ "static_assert",          sizeof( "static_assert" ) - 1          },
+		{ "__string__",             sizeof( "__string__" ) - 1             },
+		{ "typename",               sizeof( "typename" ) - 1               },
+		{ "unsigned",               sizeof( "unsigned" ) - 1               },
+		{ "signed",                 sizeof( "signed" ) - 1                 },
+		{ "short",                  sizeof( "short" ) - 1                  },
+		{ "long",		           sizeof( "long" ) - 1                   },
+		{ "bool",		           sizeof( "bool" ) - 1                   },
+		{ "char",		           sizeof( "char" ) - 1                   },
+		{ "int",		            sizeof( "int" ) - 1                    },
+		{ "double",                 sizeof( "double" ) - 1                 },
+		{ "__int8",                 sizeof( "__int8" ) - 1                 },
+		{ "__int16",                sizeof( "__int16" ) - 1                },
+		{ "__int32",                sizeof( "__int32" ) - 1                },
+		{ "__int64",                sizeof( "__int64" ) - 1                },
+		{ "_W64",		           sizeof( "_W64" ) - 1                   },
+		{ "...",		            sizeof( "..." ) - 1                    },
+		{ "__attrib_start__",       sizeof( "__attrib_start__" ) - 1       },
+		{ "GEN_API_Export_Code",    sizeof( "GEN_API_Export_Code" ) - 1    },
+		{ "GEN_API_Import_Code",    sizeof( "GEN_API_Import_Code" ) - 1    },
+		{ "COREUOBJECT_API",        sizeof( "COREUOBJECT_API" ) - 1        },
+		{ "ENGINE_API",             sizeof( "ENGINE_API" ) - 1             },
+		{ "GAMEPLAYABILITIES_API",  sizeof( "GAMEPLAYABILITIES_API" ) - 1  },
+		{ "UMG_API",                sizeof( "UMG_API" ) - 1                },
+	};
+	return lookup[type];
+}
+
+inline TokType str_to_toktype( Str str )
+{
+	local_persist u32 keymap[Tok_NumTokens];
+	do_once_start for ( u32 index = 0; index < Tok_NumTokens; index++ )
 	{
-		local_persist u32 keymap[NumSpecifiers];
-		do_once_start for ( u32 index = 0; index < NumSpecifiers; index++ )
-		{
-			StrC enum_str = to_str( (Type)index );
-			keymap[index] = crc32( enum_str.Ptr, enum_str.Len - 1 );
-		}
-		do_once_end u32 hash = crc32( str.Ptr, str.Len );
-		for ( u32 index = 0; index < NumSpecifiers; index++ )
-		{
-			if ( keymap[index] == hash )
-				return (Type)index;
-		}
-		return Invalid;
+		Str enum_str  = toktype_to_str( (TokType)index );
+		keymap[index] = crc32( enum_str.Ptr, enum_str.Len );
 	}
+	do_once_end u32 hash = crc32( str.Ptr, str.Len );
+	for ( u32 index = 0; index < Tok_NumTokens; index++ )
+	{
+		if ( keymap[index] == hash )
+			return (TokType)index;
+	}
+	return Tok_Invalid;
+}
 
-}    // namespace ESpecifier
+enum TokFlags : u32
+{
+	TF_Operator              = bit(0),
+	TF_Assign                = bit(1),
+	TF_Preprocess            = bit(2),
+	TF_Preprocess_Cond       = bit(3),
+	TF_Attribute             = bit(6),
+	TF_AccessOperator        = bit(7),
+	TF_AccessSpecifier       = bit(8),
+	TF_Specifier             = bit(9),
+	TF_EndDefinition         = bit(10),    // Either ; or }
+	TF_Formatting            = bit(11),
+	TF_Literal               = bit(12),
+	TF_Macro_Functional      = bit(13),
+	TF_Macro_Expects_Body    = bit(14),
 
-using SpecifierT = ESpecifier::Type;
+	TF_Null = 0,
+	TF_UnderlyingType = GEN_U32_MAX,
+};
 
+struct Token
+{
+	Str     Text;
+	TokType Type;
+	s32     Line;
+	s32     Column;
+	u32     Flags;
+};
+
+constexpr Token NullToken { {}, Tok_Invalid, 0, 0, TF_Null };
+
+FORCEINLINE
+AccessSpec tok_to_access_specifier(Token tok) {
+	return scast(AccessSpec, tok.Type);
+}
+
+FORCEINLINE
+Str tok_to_str(Token tok) {
+	return tok.Text;
+}
+
+FORCEINLINE
+bool tok_is_valid( Token tok ) {
+	return tok.Text.Ptr && tok.Text.Len && tok.Type != Tok_Invalid;
+}
+
+FORCEINLINE
+bool tok_is_access_operator(Token tok) {
+	return bitfield_is_set( u32, tok.Flags, TF_AccessOperator );
+}
+
+FORCEINLINE
+bool tok_is_access_specifier(Token tok) {
+	return bitfield_is_set( u32, tok.Flags, TF_AccessSpecifier );
+}
+
+FORCEINLINE
+bool tok_is_attribute(Token tok) {
+	return bitfield_is_set( u32, tok.Flags, TF_Attribute );
+}
+
+FORCEINLINE
+bool tok_is_operator(Token tok) {
+	return bitfield_is_set( u32, tok.Flags, TF_Operator );
+}
+
+FORCEINLINE
+bool tok_is_preprocessor(Token tok) {
+	return bitfield_is_set( u32, tok.Flags, TF_Preprocess );
+}
+
+FORCEINLINE
+bool tok_is_preprocess_cond(Token tok) {
+	return bitfield_is_set( u32, tok.Flags, TF_Preprocess_Cond );
+}
+
+FORCEINLINE
+bool tok_is_specifier(Token tok) {
+	return bitfield_is_set( u32, tok.Flags, TF_Specifier );
+}
+
+FORCEINLINE
+bool tok_is_end_definition(Token tok) {
+	return bitfield_is_set( u32, tok.Flags, TF_EndDefinition );
+}
+
+StrBuilder tok_to_strbuilder(Token tok);
+
+struct TokArray 
+{
+	Array(Token) Arr;
+	s32          Idx;
+};
+
+struct LexContext
+{
+	Str             content;
+	s32             left;
+	char const*     scanner;
+	s32             line;
+	s32             column;
+	// StringTable     defines;
+	Token           token;
+};
+
+struct StackNode
+{
+	StackNode* Prev;
+
+	Token* Start;
+	Str    Name;          // The name of the AST node (if parsed)
+	Str    ProcName;    // The name of the procedure
+};
+
+struct ParseContext
+{
+	TokArray   Tokens;
+	StackNode* Scope;
+};
+
+enum MacroType : u16
+{
+	MT_Expression,     // A macro is assumed to be a expression if not resolved.
+	MT_Statement,      
+	MT_Typename,
+	MT_Attribute,      // More of a note to the parser than anythign else (attributes should be defined in the user attribues def).
+	MT_Specifier,      // More of a note to the parser than anythign else (specifiers should be defined in the user attribues def).
+	MT_Block_Start,    // Not Supported yet
+	MT_Block_End,      // Not Supported yet
+	MT_Case_Statement, // Not Supported yet
+
+	MT_UnderlyingType = GEN_U16_MAX,
+};
+
+FORCEINLINE
+TokType macrotype_to_toktype( MacroType type ) {
+	switch ( type ) {
+		case MT_Statement  : return Tok_Preprocess_Macro_Stmt;
+		case MT_Expression : return Tok_Preprocess_Macro_Expr;
+		case MT_Typename   : return Tok_Preprocess_Macro_Typename;
+	}
+	// All others unsupported for now.
+	return Tok_Invalid;
+}
+
+Str macrotype_to_str( MacroType type )
+{
+	local_persist
+	Str lookup[] = {
+		{ "Statement",        sizeof("Statement")        - 1 },
+		{ "Expression",       sizeof("Expression")       - 1 },
+		{ "Typename",         sizeof("Typename")         - 1 },
+		{ "Attribute(Macro)", sizeof("Attribute(Macro)") - 1 },
+		{ "Specifier(Macro)", sizeof("Specifier(Macro)") - 1 },
+		{ "Block_Start",      sizeof("Block_Start")      - 1 },
+		{ "Block_End",        sizeof("Block_End")        - 1 },
+		{ "Case_Statement",   sizeof("Case_Statement")   - 1 },
+	};
+	local_persist
+	Str invalid = { "Invalid", sizeof("Invalid") };
+	if ( type > MT_Case_Statement )
+		return invalid;
+
+	return lookup[ type ];
+}
+
+enum EMacroFlags : u16
+{
+	MF_Functional          = bit(0), // Macro has parameters (args expected to be passed)
+	MF_Expects_Body        = bit(1), // Expects to assign a braced scope to its body.
+
+	// lex__eat wil treat this macro as an identifier if the parser attempts to consume it as one.
+	//  ^^^ This is a kludge because we don't support push/pop macro pragmas rn.
+	MF_Allow_As_Identifier = bit(2), 
+
+	// lex__eat wil treat this macro as an attribute if the parser attempts to consume it as one.
+	//  ^^^ This a kludge because unreal has a macro that behaves as both a 'statement' and an attribute (UE_DEPRECATED, PRAGMA_ENABLE_DEPRECATION_WARNINGS, etc)
+	// TODO(Ed): We can keep the MF_Allow_As_Attribute flag for macros, however, we need to add the ability of AST_Attributes to chain themselves.
+	// Its thats already a thing in the standard language anyway
+	// & it would allow UE_DEPRECATED, (UE_PROPERTY / UE_FUNCTION) to chain themselves as attributes of a resolved member function/varaible definition
+	MF_Allow_As_Attribute  = bit(3),
+
+	// When a macro is encountered after attributs and specifiers while parsing a function, or variable:
+	// It will consume the macro and treat it as resolving the definition. (Yes this is for Unreal Engine)
+	// (MUST BE OF MT_Statement TYPE)
+	MF_Allow_As_Definition = bit(4),
+
+	MF_Null           = 0,
+	MF_UnderlyingType = GEN_U16_MAX,
+};
+typedef u16 MacroFlags;
+
+struct Macro
+{
+	StrCached  Name;
+	MacroType  Type;
+	MacroFlags Flags;
+};
+
+FORCEINLINE
+b32 macro_is_functional( Macro macro ) {
+	return bitfield_is_set( b16, macro.Flags, MF_Functional );
+}
+
+FORCEINLINE
+b32 macro_expects_body( Macro macro ) {
+	return bitfield_is_set( b16, macro.Flags, MF_Expects_Body );
+}
+
+typedef HashTable(Macro) MacroTable;
 #pragma endregion Types
 
 #pragma region AST
 
+/*
+  ______   ______  ________      __    __       ______                 __
+ /      \ /      \|        \    |  \  |  \     /      \               |  \
+|  ▓▓▓▓▓▓\  ▓▓▓▓▓▓\\▓▓▓▓▓▓▓▓    | ▓▓\ | ▓▓    |  ▓▓▓▓▓▓\ ______   ____| ▓▓ ______
+| ▓▓__| ▓▓ ▓▓___\▓▓  | ▓▓       | ▓▓▓\| ▓▓    | ▓▓   \▓▓/      \ /      ▓▓/      \
+| ▓▓    ▓▓\▓▓    \   | ▓▓       | ▓▓▓▓\ ▓▓    | ▓▓     |  ▓▓▓▓▓▓\  ▓▓▓▓▓▓▓  ▓▓▓▓▓▓\
+| ▓▓▓▓▓▓▓▓_\▓▓▓▓▓▓\  | ▓▓       | ▓▓\▓▓ ▓▓    | ▓▓   __| ▓▓  | ▓▓ ▓▓  | ▓▓ ▓▓    ▓▓
+| ▓▓  | ▓▓  \__| ▓▓  | ▓▓       | ▓▓ \▓▓▓▓    | ▓▓__/  \ ▓▓__/ ▓▓ ▓▓__| ▓▓ ▓▓▓▓▓▓▓▓
+| ▓▓  | ▓▓\▓▓    ▓▓  | ▓▓       | ▓▓  \▓▓▓     \▓▓    ▓▓\▓▓    ▓▓\▓▓    ▓▓\▓▓     \
+ \▓▓   \▓▓ \▓▓▓▓▓▓    \▓▓        \▓▓   \▓▓      \▓▓▓▓▓▓  \▓▓▓▓▓▓  \▓▓▓▓▓▓▓ \▓▓▓▓▓▓▓
+*/
+
 struct AST;
 struct AST_Body;
 struct AST_Attributes;
@@ -514,6 +1118,7 @@ struct AST_Constructor;
 // struct AST_BaseClass;
 struct AST_Class;
 struct AST_Define;
+struct AST_DefineParams;
 struct AST_Destructor;
 struct AST_Enum;
 struct AST_Exec;
@@ -525,7 +1130,7 @@ struct AST_Module;
 struct AST_NS;
 struct AST_Operator;
 struct AST_OpCast;
-struct AST_Param;
+struct AST_Params;
 struct AST_Pragma;
 struct AST_PreprocessCond;
 struct AST_Specifiers;
@@ -567,21 +1172,49 @@ struct AST_Stmt_While;
 
 struct AST_Struct;
 struct AST_Template;
-struct AST_Type;
+struct AST_Typename;
 struct AST_Typedef;
 struct AST_Union;
 struct AST_Using;
 struct AST_Var;
 
+#if GEN_COMPILER_C
+typedef AST* Code;
+#else
 struct Code;
+#endif
+
+#if GEN_COMPILER_C
+typedef AST_Body*           CodeBody;
+typedef AST_Attributes*     CodeAttributes;
+typedef AST_Comment*        CodeComment;
+typedef AST_Class*          CodeClass;
+typedef AST_Constructor*    CodeConstructor;
+typedef AST_Define*         CodeDefine;
+typedef AST_DefineParams*   CodeDefineParams;
+typedef AST_Destructor*     CodeDestructor;
+typedef AST_Enum*           CodeEnum;
+typedef AST_Exec*           CodeExec;
+typedef AST_Extern*         CodeExtern;
+typedef AST_Include*        CodeInclude;
+typedef AST_Friend*         CodeFriend;
+typedef AST_Fn*             CodeFn;
+typedef AST_Module*         CodeModule;
+typedef AST_NS*             CodeNS;
+typedef AST_Operator*       CodeOperator;
+typedef AST_OpCast*         CodeOpCast;
+typedef AST_Params*         CodeParams;
+typedef AST_PreprocessCond* CodePreprocessCond;
+typedef AST_Pragma*         CodePragma;
+typedef AST_Specifiers*     CodeSpecifiers;
+#else
 struct CodeBody;
-// These are to offer ease of use and optionally strong type safety for the AST.
 struct CodeAttributes;
-// struct CodeBaseClass;
 struct CodeComment;
 struct CodeClass;
 struct CodeConstructor;
 struct CodeDefine;
+struct CodeDefineParams;
 struct CodeDestructor;
 struct CodeEnum;
 struct CodeExec;
@@ -593,12 +1226,33 @@ struct CodeModule;
 struct CodeNS;
 struct CodeOperator;
 struct CodeOpCast;
-struct CodeParam;
+struct CodeParams;
 struct CodePreprocessCond;
 struct CodePragma;
 struct CodeSpecifiers;
+#endif
 
 #if GEN_EXECUTION_EXPRESSION_SUPPORT
+
+#if GEN_COMPILER_C
+typedef AST_Expr*                CodeExpr;
+typedef AST_Expr_Assign*         CodeExpr_Assign;
+typedef AST_Expr_Alignof*        CodeExpr_Alignof;
+typedef AST_Expr_Binary*         CodeExpr_Binary;
+typedef AST_Expr_CStyleCast*     CodeExpr_CStyleCast;
+typedef AST_Expr_FunctionalCast* CodeExpr_FunctionalCast;
+typedef AST_Expr_CppCast*        CodeExpr_CppCast;
+typedef AST_Expr_Element*        CodeExpr_Element;
+typedef AST_Expr_ProcCall*       CodeExpr_ProcCall;
+typedef AST_Expr_Decltype*       CodeExpr_Decltype;
+typedef AST_Expr_Comma*          CodeExpr_Comma;
+typedef AST_Expr_AMS*            CodeExpr_AMS; // Access Member Symbol
+typedef AST_Expr_Sizeof*         CodeExpr_Sizeof;
+typedef AST_Expr_Subscript*      CodeExpr_Subscript;
+typedef AST_Expr_Ternary*        CodeExpr_Ternary;
+typedef AST_Expr_UnaryPrefix*    CodeExpr_UnaryPrefix;
+typedef AST_Expr_UnaryPostfix*   CodeExpr_UnaryPostfix;
+#else
 struct CodeExpr;
 struct CodeExpr_Assign;
 struct CodeExpr_Alignof;
@@ -616,7 +1270,24 @@ struct CodeExpr_Subscript;
 struct CodeExpr_Ternary;
 struct CodeExpr_UnaryPrefix;
 struct CodeExpr_UnaryPostfix;
+#endif
 
+#if GEN_COMPILER_C
+typedef AST_Stmt*          CodeStmt;
+typedef AST_Stmt_Break*    CodeStmt_Break;
+typedef AST_Stmt_Case*     CodeStmt_Case;
+typedef AST_Stmt_Continue* CodeStmt_Continue;
+typedef AST_Stmt_Decl*     CodeStmt_Decl;
+typedef AST_Stmt_Do*       CodeStmt_Do;
+typedef AST_Stmt_Expr*     CodeStmt_Expr;
+typedef AST_Stmt_Else*     CodeStmt_Else;
+typedef AST_Stmt_If*       CodeStmt_If;
+typedef AST_Stmt_For*      CodeStmt_For;
+typedef AST_Stmt_Goto*     CodeStmt_Goto;
+typedef AST_Stmt_Label*    CodeStmt_Label;
+typedef AST_Stmt_Switch*   CodeStmt_Switch;
+typedef AST_Stmt_While*    CodeStmt_While;
+#else
 struct CodeStmt;
 struct CodeStmt_Break;
 struct CodeStmt_Case;
@@ -633,19 +1304,50 @@ struct CodeStmt_Switch;
 struct CodeStmt_While;
 #endif
 
+// GEN_EXECUTION_EXPRESSION_SUPPORT
+#endif
+
+#if GEN_COMPILER_C
+typedef AST_Struct*   CodeStruct;
+typedef AST_Template* CodeTemplate;
+typedef AST_Typename* CodeTypename;
+typedef AST_Typedef*  CodeTypedef;
+typedef AST_Union*    CodeUnion;
+typedef AST_Using*    CodeUsing;
+typedef AST_Var*      CodeVar;
+#else
 struct CodeStruct;
 struct CodeTemplate;
-struct CodeType;
+struct CodeTypename;
 struct CodeTypedef;
 struct CodeUnion;
 struct CodeUsing;
 struct CodeVar;
+#endif
 
-namespace parser
-{
-	struct Token;
-}
+#if GEN_COMPILER_CPP
+template< class Type> FORCEINLINE Type tmpl_cast( Code self ) { return * rcast( Type*, & self ); }
+#endif
 
+#pragma region Code C-Interface
+
+GEN_API void       code_append           (Code code, Code other );
+GEN_API Str        code_debug_str        (Code code);
+GEN_API Code       code_duplicate        (Code code);
+GEN_API Code*      code_entry            (Code code, u32 idx );
+GEN_API bool       code_has_entries      (Code code);
+GEN_API bool       code_is_body          (Code code);
+GEN_API bool       code_is_equal         (Code code, Code other);
+GEN_API bool       code_is_valid         (Code code);
+GEN_API void       code_set_global       (Code code);
+GEN_API StrBuilder code_to_strbuilder    (Code self );
+GEN_API void       code_to_strbuilder_ptr(Code self, StrBuilder* result );
+GEN_API Str        code_type_str         (Code self );
+GEN_API bool       code_validate_body    (Code self );
+
+#pragma endregion Code C-Interface
+
+#if GEN_COMPILER_CPP
 /*
 	AST* wrapper
 	- Not constantly have to append the '*' as this is written often..
@@ -653,55 +1355,41 @@ namespace parser
 */
 struct Code
 {
-#	pragma region Statics
-	// Used to identify ASTs that should always be duplicated. (Global constant ASTs)
-	static Code Global;
+	AST* ast;
 
-	// Used to identify invalid generated code.
-	static Code Invalid;
-#	pragma endregion Statics
+#	define Using_Code( Typename )                                                        \
+	FORCEINLINE Str  debug_str()                { return code_debug_str(* this); }       \
+	FORCEINLINE Code duplicate()                { return code_duplicate(* this); }	     \
+	FORCEINLINE bool is_equal( Code other )     { return code_is_equal(* this, other); } \
+	FORCEINLINE bool is_body()                  { return code_is_body(* this); }         \
+	FORCEINLINE bool is_valid()                 { return code_is_valid(* this); }        \
+	FORCEINLINE void set_global()               { return code_set_global(* this); }
 
-#	define Using_Code( Typename )          \
-	char const* debug_str();               \
-	Code        duplicate();			   \
-	bool        is_equal( Code other );    \
-	bool        is_valid();                \
-	void        set_global();              \
-	String      to_string();               \
-	Typename&   operator = ( AST* other ); \
-	Typename&   operator = ( Code other ); \
-	bool        operator ==( Code other ); \
-	bool        operator !=( Code other ); \
+#	define Using_CodeOps( Typename )                                                                           \
+	FORCEINLINE Typename&  operator = ( Code other );                                                          \
+	FORCEINLINE bool       operator ==( Code other )                        { return (AST*)ast == other.ast; } \
+	FORCEINLINE bool       operator !=( Code other )                        { return (AST*)ast != other.ast; } \
+	FORCEINLINE bool       operator ==(std::nullptr_t) const                { return ast == nullptr; }         \
+	FORCEINLINE bool       operator !=(std::nullptr_t) const                { return ast != nullptr;  }        \
 	operator bool();
 
+#if ! GEN_C_LIKE_CPP
 	Using_Code( Code );
+	FORCEINLINE void       append(Code other)                { return code_append(* this, other); }
+	FORCEINLINE Code*      entry(u32 idx)                    { return code_entry(* this, idx); }
+	FORCEINLINE bool       has_entries()                     { return code_has_entries(* this); }
+	FORCEINLINE StrBuilder to_strbuilder()                   { return code_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder(StrBuilder& result) { return code_to_strbuilder_ptr(* this, & result); }
+	FORCEINLINE Str        type_str()                        { return code_type_str(* this); }
+	FORCEINLINE bool       validate_body()                   { return code_validate_body(*this); }
+#endif
 
-	template< class Type >
-	FORCEINLINE Type cast()
-	{
-		return * rcast( Type*, this );
-	}
+	Using_CodeOps( Code );
+	FORCEINLINE Code operator *() { return * this; } // Required to support for-range iteration.
+	FORCEINLINE AST* operator ->() { return ast; }
 
-	AST* operator ->()
-	{
-		return ast;
-	}
 	Code& operator ++();
 
-	// TODO(Ed) : Remove this overload.
-	auto& operator*()
-	{
-		local_persist thread_local
-		Code NullRef = { nullptr };
-
-		if ( ast == nullptr )
-			return NullRef;
-
-		return *this;
-	}
-
-	AST* ast;
-
 #ifdef GEN_ENFORCE_STRONG_CODE_TYPES
 #	define operator explicit operator
 #endif
@@ -712,6 +1400,7 @@ struct Code
 	operator CodeClass() const;
 	operator CodeConstructor() const;
 	operator CodeDefine() const;
+	operator CodeDefineParams() const;
 	operator CodeDestructor() const;
 	operator CodeExec() const;
 	operator CodeEnum() const;
@@ -723,490 +1412,440 @@ struct Code
 	operator CodeNS() const;
 	operator CodeOperator() const;
 	operator CodeOpCast() const;
-	operator CodeParam() const;
+	operator CodeParams() const;
 	operator CodePragma() const;
 	operator CodePreprocessCond() const;
 	operator CodeSpecifiers() const;
 	operator CodeStruct() const;
 	operator CodeTemplate() const;
-	operator CodeType() const;
+	operator CodeTypename() const;
 	operator CodeTypedef() const;
 	operator CodeUnion() const;
 	operator CodeUsing() const;
 	operator CodeVar() const;
 	#undef operator
 };
+#endif
+
+#pragma region Statics
+// Used to identify ASTs that should always be duplicated. (Global constant ASTs)
+extern Code Code_Global;
+
+// Used to identify invalid generated code.
+extern Code Code_Invalid;
+#pragma endregion Statics
 
 struct Code_POD
 {
 	AST* ast;
 };
-
 static_assert( sizeof(Code) == sizeof(Code_POD), "ERROR: Code is not POD" );
 
 // Desired width of the AST data structure.
 constexpr int const AST_POD_Size = 128;
 
+constexpr static
+int AST_ArrSpecs_Cap =
+(
+	AST_POD_Size
+	- sizeof(Code)
+	- sizeof(StrCached)
+	- sizeof(Code) * 2
+	- sizeof(Token*)
+	- sizeof(Code)
+	- sizeof(CodeType)
+	- sizeof(ModuleFlag)
+	- sizeof(u32)
+)
+/ sizeof(Specifier) - 1;
+
 /*
 	Simple AST POD with functionality to seralize into C++ syntax.
+	TODO(Ed): Eventually haven't a transparent AST like this will longer be viable once statements & expressions are in (most likely....)
 */
 struct AST
 {
-#	pragma region Member Functions
-	void        append     ( AST* other );
-	char const* debug_str  ();
-	AST*        duplicate  ();
-	Code&       entry      ( u32 idx );
-	bool        has_entries();
-	bool        is_equal   ( AST* other );
-	char const* type_str();
-	bool        validate_body();
-
-	String to_string();
-
-	neverinline
-	void to_string( String& result );
-
-	template< class Type >
-	FORCEINLINE Type cast()
-	{
-		return * this;
-	}
-
-	operator Code();
-	operator CodeBody();
-	operator CodeAttributes();
-	// operator CodeBaseClass();
-	operator CodeComment();
-	operator CodeConstructor();
-	operator CodeDestructor();
-	operator CodeClass();
-	operator CodeDefine();
-	operator CodeEnum();
-	operator CodeExec();
-	operator CodeExtern();
-	operator CodeInclude();
-	operator CodeFriend();
-	operator CodeFn();
-	operator CodeModule();
-	operator CodeNS();
-	operator CodeOperator();
-	operator CodeOpCast();
-	operator CodeParam();
-	operator CodePragma();
-	operator CodePreprocessCond();
-	operator CodeSpecifiers();
-	operator CodeStruct();
-	operator CodeTemplate();
-	operator CodeType();
-	operator CodeTypedef();
-	operator CodeUnion();
-	operator CodeUsing();
-	operator CodeVar();
-#	pragma endregion Member Functions
-
-	constexpr static
-	int ArrSpecs_Cap =
-	(
-			AST_POD_Size
-			- sizeof(AST*) * 3
-			- sizeof(parser::Token*)
-			- sizeof(AST*)
-			- sizeof(StringCached)
-			- sizeof(CodeT)
-			- sizeof(ModuleFlag)
-			- sizeof(int)
-	)
-	/ sizeof(int) - 1; // -1 for 4 extra bytes
-
 	union {
 		struct
 		{
-			AST*      InlineCmt;       // Class, Constructor, Destructor, Enum, Friend, Functon, Operator, OpCast, Struct, Typedef, Using, Variable
-			AST*      Attributes;      // Class, Enum, Function, Struct, Typedef, Union, Using, Variable
-			AST*      Specs;           // Destructor, Function, Operator, Typename, Variable
+			Code      InlineCmt;       // Class, Constructor, Destructor, Enum, Friend, Functon, Operator, OpCast, Struct, Typedef, Using, Variable
+			Code      Attributes;      // Class, Enum, Function, Struct, Typedef, Union, Using, Variable // TODO(Ed): Parameters can have attributes
+			Code      Specs;           // Destructor, Function, Operator, Typename, Variable
 			union {
-				AST*  InitializerList; // Constructor
-				AST*  ParentType;      // Class, Struct, ParentType->Next has a possible list of interfaces.
-				AST*  ReturnType;      // Function, Operator, Typename
-				AST*  UnderlyingType;  // Enum, Typedef
-				AST*  ValueType;       // Parameter, Variable
+				Code  InitializerList; // Constructor
+				Code  ParentType;      // Class, Struct, ParentType->Next has a possible list of interfaces.
+				Code  ReturnType;      // Function, Operator, Typename
+				Code  UnderlyingType;  // Enum, Typedef
+				Code  ValueType;       // Parameter, Variable
 			};
 			union {
-				AST*  Macro;           // Parameter
-				AST*  BitfieldSize;    // Variable (Class/Struct Data Member)
-				AST*  Params;          // Constructor, Function, Operator, Template, Typename
+				Code  Macro;               // Parameter
+				Code  BitfieldSize;        // Variable (Class/Struct Data Member)
+				Code  Params;              // Constructor, Define, Function, Operator, Template, Typename
+				Code  UnderlyingTypeMacro; // Enum
 			};
 			union {
-				AST*  ArrExpr;          // Typename
-				AST*  Body;             // Class, Constructor, Destructor, Enum, Friend, Function, Namespace, Struct, Union
-				AST*  Declaration;      // Friend, Template
-				AST*  Value;            // Parameter, Variable
+				Code  ArrExpr;          // Typename
+				Code  Body;             // Class, Constructor, Define, Destructor, Enum, Friend, Function, Namespace, Struct, Union
+				Code  Declaration;      // Friend, Template
+				Code  Value;            // Parameter, Variable
 			};
 			union {
-				AST*  NextVar;          // Variable; Possible way to handle comma separated variables declarations. ( , NextVar->Specs NextVar->Name NextVar->ArrExpr = NextVar->Value )
-				AST*  SuffixSpecs;      // Only used with typenames, to store the function suffix if typename is function signature. ( May not be needed )
-				AST*  PostNameMacro;     // Only used with parameters for specifically UE_REQUIRES (Thanks Unreal)
+				Code  NextVar;          // Variable; Possible way to handle comma separated variables declarations. ( , NextVar->Specs NextVar->Name NextVar->ArrExpr = NextVar->Value )
+				Code  SuffixSpecs;      // Only used with typenames, to store the function suffix if typename is function signature. ( May not be needed )
+				Code  PostNameMacro;    // Only used with parameters for specifically UE_REQUIRES (Thanks Unreal)
 			};
 		};
-		StringCached  Content;          // Attributes, Comment, Execution, Include
+		StrCached  Content;          // Attributes, Comment, Execution, Include
 		struct {
-			SpecifierT ArrSpecs[ArrSpecs_Cap]; // Specifiers
-			AST*       NextSpecs;              // Specifiers; If ArrSpecs is full, then NextSpecs is used.
+			Specifier  ArrSpecs[AST_ArrSpecs_Cap]; // Specifiers
+			Code       NextSpecs;              // Specifiers; If ArrSpecs is full, then NextSpecs is used.
 		};
 	};
+	StrCached      Name;
 	union {
-		AST* Prev;
-		AST* Front;
-		AST* Last;
+		Code Prev;
+		Code Front;
+		Code Last;
 	};
 	union {
-		AST* Next;
-		AST* Back;
+		Code Next;
+		Code Back;
 	};
-	parser::Token*    Token; // Reference to starting token, only avaialble if it was derived from parsing.
-	AST*              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	Token*            Token; // Reference to starting token, only avaialble if it was derived from parsing.
+	Code              Parent;
+	CodeType          Type;
 //	CodeFlag          CodeFlags;
 	ModuleFlag        ModuleFlags;
 	union {
 		b32           IsFunction;  // Used by typedef to not serialize the name field.
-		b32           IsParamPack; // Used by typename to know if type should be considered a parameter pack.
-		OperatorT     Op;
-		AccessSpec    ParentAccess;
-		s32           NumEntries;
-		s32           VarConstructorInit; // Used by variables to know that initialization is using a constructor expression instead of an assignment expression.
-	};
-};
-
-struct AST_POD
-{
-	union {
-		struct
-		{
-			AST*      InlineCmt;       // Class, Constructor, Destructor, Enum, Friend, Functon, Operator, OpCast, Struct, Typedef, Using, Variable
-			AST*      Attributes;      // Class, Enum, Function, Struct, Typedef, Union, Using, Variable
-			AST*      Specs;           // Destructor, Function, Operator, Typename, Variable
-			union {
-				AST*  InitializerList; // Constructor
-				AST*  ParentType;      // Class, Struct, ParentType->Next has a possible list of interfaces.
-				AST*  ReturnType;      // Function, Operator, Typename
-				AST*  UnderlyingType;  // Enum, Typedef
-				AST*  ValueType;       // Parameter, Variable
-			};
-			union {
-				AST*  Macro;           // Parameter
-				AST*  BitfieldSize;    // Variable (Class/Struct Data Member)
-				AST*  Params;          // Constructor, Function, Operator, Template, Typename
-			};
-			union {
-				AST*  ArrExpr;          // Typename
-				AST*  Body;             // Class, Constructr, Destructor, Enum, Friend, Function, Namespace, Struct, Union
-				AST*  Declaration;      // Friend, Template
-				AST*  Value;            // Parameter, Variable
-			};
-			union {
-				AST*  NextVar;          // Variable; Possible way to handle comma separated variables declarations. ( , NextVar->Specs NextVar->Name NextVar->ArrExpr = NextVar->Value )
-				AST*  SuffixSpecs;      // Only used with typenames, to store the function suffix if typename is function signature. ( May not be needed )
-				AST*  PostNameMacro;    // Only used with parameters for specifically UE_REQUIRES (Thanks Unreal)
-			};
-		};
-		StringCached  Content;          // Attributes, Comment, Execution, Include
 		struct {
-			SpecifierT ArrSpecs[AST::ArrSpecs_Cap]; // Specifiers
-			AST*       NextSpecs;                   // Specifiers; If ArrSpecs is full, then NextSpecs is used.
+			b16           IsParamPack;   // Used by typename to know if type should be considered a parameter pack.
+			ETypenameTag  TypeTag;       // Used by typename to keep track of explicitly declared tags for the identifier (enum, struct, union)
 		};
-	};
-	union {
-		AST* Prev;
-		AST* Front;
-		AST* Last;
-	};
-	union {
-		AST* Next;
-		AST* Back;
-	};
-	parser::Token*    Token; // Reference to starting token, only avaialble if it was derived from parsing.
-	AST*              Parent;
-	StringCached      Name;
-	CodeT             Type;
-	CodeFlag          CodeFlags;
-	ModuleFlag        ModuleFlags;
-	union {
-		b32           IsFunction;  // Used by typedef to not serialize the name field.
-		b32           IsParamPack; // Used by typename to know if type should be considered a parameter pack.
-		OperatorT     Op;
+		Operator      Op;
 		AccessSpec    ParentAccess;
 		s32           NumEntries;
-		s32           VarConstructorInit; // Used by variables to know that initialization is using a constructor expression instead of an assignment expression.
+		s32           VarParenthesizedInit;  // Used by variables to know that initialization is using a constructor expression instead of an assignment expression.
 	};
 };
+static_assert( sizeof(AST) == AST_POD_Size, "ERROR: AST is not size of AST_POD_Size" );
 
-struct test {
-	SpecifierT ArrSpecs[AST::ArrSpecs_Cap]; // Specifiers
-	AST* NextSpecs;                         // Specifiers; If ArrSpecs is full, then NextSpecs is used.
-};
-
-constexpr int pls = sizeof(test);
-
-// Its intended for the AST to have equivalent size to its POD.
-// All extra functionality within the AST namespace should just be syntatic sugar.
-static_assert( sizeof(AST)     == sizeof(AST_POD), "ERROR: AST IS NOT POD" );
-static_assert( sizeof(AST_POD) == AST_POD_Size,    "ERROR: AST POD is not size of AST_POD_Size" );
+#if GEN_COMPILER_CPP
+// Uses an implicitly overloaded cast from the AST to the desired code type.
+// Necessary if the user wants GEN_ENFORCE_STRONG_CODE_TYPES
+struct  InvalidCode_ImplictCaster;
+#define InvalidCode (InvalidCode_ImplictCaster{})
+#else
+#define InvalidCode (void*){ (void*)Code_Invalid }
+#endif
 
+#if GEN_COMPILER_CPP
+struct NullCode_ImplicitCaster;
 // Used when the its desired when omission is allowed in a definition.
-#define NoCode      { nullptr }
-#define CodeInvalid (* Code::Invalid.ast) // Uses an implicitly overloaded cast from the AST to the desired code type.
+#define NullCode    (NullCode_ImplicitCaster{})
+#else
+#define NullCode    nullptr
+#endif
 
-#pragma region Code Types
+/*
+  ______                 __               ______            __                        ______
+ /      \               |  \             |      \          |  \                      /      \
+|  ▓▓▓▓▓▓\ ______   ____| ▓▓ ______       \▓▓▓▓▓▓_______  _| ▓▓_    ______   ______ |  ▓▓▓▓▓▓\ ______   _______  ______
+| ▓▓   \▓▓/      \ /      ▓▓/      \       | ▓▓ |       \|   ▓▓ \  /      \ /      \| ▓▓_  \▓▓|      \ /       \/      \
+| ▓▓     |  ▓▓▓▓▓▓\  ▓▓▓▓▓▓▓  ▓▓▓▓▓▓\      | ▓▓ | ▓▓▓▓▓▓▓\\▓▓▓▓▓▓ |  ▓▓▓▓▓▓\  ▓▓▓▓▓▓\ ▓▓ \     \▓▓▓▓▓▓\  ▓▓▓▓▓▓▓  ▓▓▓▓▓▓\
+| ▓▓   __| ▓▓  | ▓▓ ▓▓  | ▓▓ ▓▓    ▓▓      | ▓▓ | ▓▓  | ▓▓ | ▓▓ __| ▓▓    ▓▓ ▓▓   \▓▓ ▓▓▓▓    /      ▓▓ ▓▓     | ▓▓    ▓▓
+| ▓▓__/  \ ▓▓__/ ▓▓ ▓▓__| ▓▓ ▓▓▓▓▓▓▓▓     _| ▓▓_| ▓▓  | ▓▓ | ▓▓|  \ ▓▓▓▓▓▓▓▓ ▓▓     | ▓▓     |  ▓▓▓▓▓▓▓ ▓▓_____| ▓▓▓▓▓▓▓▓
+ \▓▓    ▓▓\▓▓    ▓▓\▓▓    ▓▓\▓▓     \    |   ▓▓ \ ▓▓  | ▓▓  \▓▓  ▓▓\▓▓     \ ▓▓     | ▓▓      \▓▓    ▓▓\▓▓     \\▓▓     \
+  \▓▓▓▓▓▓  \▓▓▓▓▓▓  \▓▓▓▓▓▓▓ \▓▓▓▓▓▓▓     \▓▓▓▓▓▓\▓▓   \▓▓   \▓▓▓▓  \▓▓▓▓▓▓▓\▓▓      \▓▓       \▓▓▓▓▓▓▓ \▓▓▓▓▓▓▓ \▓▓▓▓▓▓▓
+*/
+
+#pragma region Code Type C-Interface
+
+GEN_API void       body_append              ( CodeBody body, Code     other );
+GEN_API void       body_append_body         ( CodeBody body, CodeBody other );
+GEN_API StrBuilder body_to_strbuilder       ( CodeBody body );
+GEN_API void       body_to_strbuilder_ref   ( CodeBody body, StrBuilder* result );
+GEN_API void       body_to_strbuilder_export( CodeBody body, StrBuilder* result );
+
+GEN_API Code begin_CodeBody( CodeBody body);
+GEN_API Code end_CodeBody  ( CodeBody body );
+GEN_API Code next_CodeBody ( CodeBody body, Code entry_iter );
+
+GEN_API void       class_add_interface    ( CodeClass self, CodeTypename interface );
+GEN_API StrBuilder class_to_strbuilder    ( CodeClass self );
+GEN_API void       class_to_strbuilder_def( CodeClass self, StrBuilder* result );
+GEN_API void       class_to_strbuilder_fwd( CodeClass self, StrBuilder* result );
+
+GEN_API void             define_params_append           (CodeDefineParams appendee, CodeDefineParams other );
+GEN_API CodeDefineParams define_params_get              (CodeDefineParams params, s32 idx);
+GEN_API bool             define_params_has_entries      (CodeDefineParams params );
+GEN_API StrBuilder       define_params_to_strbuilder    (CodeDefineParams params );
+GEN_API void             define_params_to_strbuilder_ref(CodeDefineParams params, StrBuilder* result );
+
+GEN_API CodeDefineParams begin_CodeDefineParams(CodeDefineParams params);
+GEN_API CodeDefineParams end_CodeDefineParams  (CodeDefineParams params);
+GEN_API CodeDefineParams next_CodeDefineParams (CodeDefineParams params, CodeDefineParams entry_iter);
+
+GEN_API void       params_append           (CodeParams appendee, CodeParams other );
+GEN_API CodeParams params_get              (CodeParams params, s32 idx);
+GEN_API bool       params_has_entries      (CodeParams params );
+GEN_API StrBuilder params_to_strbuilder    (CodeParams params );
+GEN_API void       params_to_strbuilder_ref(CodeParams params, StrBuilder* result );
+
+GEN_API CodeParams begin_CodeParams(CodeParams params);
+GEN_API CodeParams end_CodeParams  (CodeParams params);
+GEN_API CodeParams next_CodeParams (CodeParams params, CodeParams entry_iter);
+
+GEN_API bool       specifiers_append           (CodeSpecifiers specifiers, Specifier spec);
+GEN_API s32        specifiers_has              (CodeSpecifiers specifiers, Specifier spec);
+GEN_API s32        specifiers_remove           (CodeSpecifiers specifiers, Specifier to_remove );
+GEN_API StrBuilder specifiers_to_strbuilder    (CodeSpecifiers specifiers);
+GEN_API void       specifiers_to_strbuilder_ref(CodeSpecifiers specifiers, StrBuilder* result);
+
+GEN_API Specifier* begin_CodeSpecifiers(CodeSpecifiers specifiers);
+GEN_API Specifier* end_CodeSpecifiers  (CodeSpecifiers specifiers);
+GEN_API Specifier* next_CodeSpecifiers (CodeSpecifiers specifiers, Specifier* spec_iter);
+
+GEN_API void       struct_add_interface    (CodeStruct self, CodeTypename interface);
+GEN_API StrBuilder struct_to_strbuilder    (CodeStruct self);
+GEN_API void       struct_to_strbuilder_fwd(CodeStruct self, StrBuilder* result);
+GEN_API void       struct_to_strbuilder_def(CodeStruct self, StrBuilder* result);
+
+GEN_API StrBuilder attributes_to_strbuilder    (CodeAttributes attributes);
+GEN_API void       attributes_to_strbuilder_ref(CodeAttributes attributes, StrBuilder* result);
+
+GEN_API StrBuilder comment_to_strbuilder    (CodeComment comment );
+GEN_API void       comment_to_strbuilder_ref(CodeComment comment, StrBuilder* result );
+
+GEN_API StrBuilder constructor_to_strbuilder    (CodeConstructor constructor);
+GEN_API void       constructor_to_strbuilder_def(CodeConstructor constructor, StrBuilder* result );
+GEN_API void       constructor_to_strbuilder_fwd(CodeConstructor constructor, StrBuilder* result );
+
+GEN_API StrBuilder define_to_strbuilder    (CodeDefine self);
+GEN_API void       define_to_strbuilder_ref(CodeDefine self, StrBuilder* result);
+
+GEN_API StrBuilder destructor_to_strbuilder    (CodeDestructor destructor);
+GEN_API void       destructor_to_strbuilder_fwd(CodeDestructor destructor, StrBuilder* result );
+GEN_API void       destructor_to_strbuilder_def(CodeDestructor destructor, StrBuilder* result );
+
+GEN_API StrBuilder enum_to_strbuilder          (CodeEnum self);
+GEN_API void       enum_to_strbuilder_def      (CodeEnum self, StrBuilder* result );
+GEN_API void       enum_to_strbuilder_fwd      (CodeEnum self, StrBuilder* result );
+GEN_API void       enum_to_strbuilder_class_def(CodeEnum self, StrBuilder* result );
+GEN_API void       enum_to_strbuilder_class_fwd(CodeEnum self, StrBuilder* result );
+
+GEN_API StrBuilder exec_to_strbuilder    (CodeExec exec);
+GEN_API void       exec_to_strbuilder_ref(CodeExec exec, StrBuilder* result);
+
+GEN_API void extern_to_strbuilder(CodeExtern self, StrBuilder* result);
+
+GEN_API StrBuilder include_to_strbuilder    (CodeInclude self);
+GEN_API void       include_to_strbuilder_ref(CodeInclude self, StrBuilder* result);
+
+GEN_API StrBuilder friend_to_strbuilder     (CodeFriend self);
+GEN_API void       friend_to_strbuilder_ref(CodeFriend self, StrBuilder* result);
+
+GEN_API StrBuilder fn_to_strbuilder    (CodeFn self);
+GEN_API void       fn_to_strbuilder_def(CodeFn self, StrBuilder* result);
+GEN_API void       fn_to_strbuilder_fwd(CodeFn self, StrBuilder* result);
+
+GEN_API StrBuilder module_to_strbuilder    (CodeModule self);
+GEN_API void       module_to_strbuilder_ref(CodeModule self, StrBuilder* result);
+
+GEN_API StrBuilder namespace_to_strbuilder    (CodeNS self);
+GEN_API void       namespace_to_strbuilder_ref(CodeNS self, StrBuilder* result);
+
+GEN_API StrBuilder code_op_to_strbuilder    (CodeOperator self);
+GEN_API void       code_op_to_strbuilder_fwd(CodeOperator self, StrBuilder* result );
+GEN_API void       code_op_to_strbuilder_def(CodeOperator self, StrBuilder* result );
+
+GEN_API StrBuilder opcast_to_strbuilder     (CodeOpCast op_cast );
+GEN_API void       opcast_to_strbuilder_def(CodeOpCast op_cast, StrBuilder* result );
+GEN_API void       opcast_to_strbuilder_fwd(CodeOpCast op_cast, StrBuilder* result );
+
+GEN_API StrBuilder pragma_to_strbuilder    (CodePragma self);
+GEN_API void       pragma_to_strbuilder_ref(CodePragma self, StrBuilder* result);
+
+GEN_API StrBuilder preprocess_to_strbuilder       (CodePreprocessCond cond);
+GEN_API void       preprocess_to_strbuilder_if    (CodePreprocessCond cond, StrBuilder* result );
+GEN_API void       preprocess_to_strbuilder_ifdef (CodePreprocessCond cond, StrBuilder* result );
+GEN_API void       preprocess_to_strbuilder_ifndef(CodePreprocessCond cond, StrBuilder* result );
+GEN_API void       preprocess_to_strbuilder_elif  (CodePreprocessCond cond, StrBuilder* result );
+GEN_API void       preprocess_to_strbuilder_else  (CodePreprocessCond cond, StrBuilder* result );
+GEN_API void       preprocess_to_strbuilder_endif (CodePreprocessCond cond, StrBuilder* result );
+
+GEN_API StrBuilder template_to_strbuilder    (CodeTemplate self);
+GEN_API void       template_to_strbuilder_ref(CodeTemplate self, StrBuilder* result);
+
+GEN_API StrBuilder typename_to_strbuilder    (CodeTypename self);
+GEN_API void       typename_to_strbuilder_ref(CodeTypename self, StrBuilder* result);
+
+GEN_API StrBuilder typedef_to_strbuilder    (CodeTypedef self);
+GEN_API void       typedef_to_strbuilder_ref(CodeTypedef self, StrBuilder* result );
+
+GEN_API StrBuilder union_to_strbuilder    (CodeUnion self);
+GEN_API void       union_to_strbuilder_def(CodeUnion self, StrBuilder* result);
+GEN_API void       union_to_strbuilder_fwd(CodeUnion self, StrBuilder* result);
+
+GEN_API StrBuilder using_to_strbuilder    (CodeUsing op_cast );
+GEN_API void       using_to_strbuilder_ref(CodeUsing op_cast, StrBuilder* result );
+GEN_API void       using_to_strbuilder_ns (CodeUsing op_cast, StrBuilder* result );
+
+GEN_API StrBuilder var_to_strbuilder    (CodeVar self);
+GEN_API void       var_to_strbuilder_ref(CodeVar self, StrBuilder* result);
+
+#pragma endregion Code Type C-Interface
+
+#if GEN_COMPILER_CPP
+#pragma region Code Types C++
+
+// These structs are not used at all by the C vairant.
+static_assert( GEN_COMPILER_CPP, "This should not be compiled with the C-library" );
+
+#define Verify_POD(Type) static_assert(size_of(Code##Type) == size_of(AST_##Type), "ERROR: Code##Type is not a POD")
 
 struct CodeBody
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeBody );
+	FORCEINLINE void       append( Code other )                       { return body_append( *this, other ); }
+	FORCEINLINE void       append( CodeBody body )                    { return body_append(*this, body); }
+	FORCEINLINE bool       has_entries()                              { return code_has_entries(* this); }
+	FORCEINLINE StrBuilder to_strbuilder()                            { return body_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result )        { return body_to_strbuilder_ref(* this, & result ); }
+	FORCEINLINE void       to_strbuilder_export( StrBuilder& result ) { return body_to_strbuilder_export(* this, & result); }
 
-	void append( Code other )
-	{
-		raw()->append( other.ast );
-	}
-	void append( CodeBody body )
-	{
-		for ( Code entry : body )
-		{
-			append( entry );
-		}
-	}
-	bool has_entries()
-	{
-		return rcast( AST*, ast )->has_entries();
-	}
-	void to_string( String& result );
-	void to_string_export( String& result );
-	AST* raw()
-	{
-		return rcast( AST*, ast );
-	}
-	AST_Body* operator->()
-	{
-		return ast;
-	}
-	operator Code()
-	{
-		return * rcast( Code*, this );
-	}
-#pragma region Iterator
-	Code begin()
-	{
-		if ( ast )
-			return { rcast( AST*, ast)->Front };
-
-		return { nullptr };
-	}
-	Code end()
-	{
-		return { rcast(AST*, ast)->Back->Next };
-	}
-#pragma endregion Iterator
-
+#endif
+	FORCEINLINE Code begin() { return begin_CodeBody(* this); }
+	FORCEINLINE Code end()   { return end_CodeBody(* this); }
+	Using_CodeOps( CodeBody );
+	FORCEINLINE operator Code() { return * rcast( Code*, this ); }
+	FORCEINLINE AST_Body* operator->() { return ast; }
 	AST_Body* ast;
 };
 
 struct CodeClass
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeClass );
-
-	void add_interface( CodeType interface );
-
-	void to_string_def( String& result );
-	void to_string_fwd( String& result );
-
-	AST* raw()
-	{
-		return rcast( AST*, ast );
-	}
-	operator Code()
-	{
-		return * rcast( Code*, this );
-	}
-	AST_Class* operator->()
-	{
-		if ( ast == nullptr )
-		{
-			log_failure("Attempt to dereference a nullptr");
-			return nullptr;
-		}
+	FORCEINLINE void       add_interface( CodeType interface );
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder_def( StrBuilder& result );
+	FORCEINLINE void       to_strbuilder_fwd( StrBuilder& result );
+#endif
+	Using_CodeOps( CodeClass );
+	FORCEINLINE operator Code() { return * rcast( Code*, this ); }
+	FORCEINLINE AST_Class* operator->() {
+		GEN_ASSERT(ast);
 		return ast;
 	}
 	AST_Class* ast;
 };
 
-struct CodeParam
+struct CodeParams
 {
-	Using_Code( CodeParam );
-
-	void append( CodeParam other );
-
-	CodeParam get( s32 idx );
-	bool has_entries();
-	void to_string( String& result );
-	AST* raw()
-	{
-		return rcast( AST*, ast );
-	}
-	AST_Param* operator->()
-	{
-		if ( ast == nullptr )
-		{
-			log_failure("Attempt to dereference a nullptr!");
-			return nullptr;
-		}
+#if ! GEN_C_LIKE_CPP
+	Using_Code( CodeParams );
+	FORCEINLINE void          append( CodeParams other )          { return params_append(* this, other); }
+	FORCEINLINE CodeParams    get( s32 idx )                      { return params_get( * this, idx); }
+	FORCEINLINE bool          has_entries()                       { return params_has_entries(* this); }
+	FORCEINLINE StrBuilder    to_strbuilder()                     { return params_to_strbuilder(* this); }
+	FORCEINLINE void          to_strbuilder( StrBuilder& result ) { return params_to_strbuilder_ref(*this, & result); }
+#endif
+	Using_CodeOps( CodeParams );
+	FORCEINLINE CodeParams begin() { return begin_CodeParams(* this); }
+	FORCEINLINE CodeParams end()   { return end_CodeParams(* this); }
+	FORCEINLINE operator Code() { return { (AST*)ast }; }
+	FORCEINLINE CodeParams  operator *() { return * this; } // Required to support for-range iteration.
+	FORCEINLINE AST_Params* operator->() {
+		GEN_ASSERT(ast);
 		return ast;
 	}
-	operator Code()
-	{
-		return { (AST*)ast };
-	}
-#pragma region Iterator
-	CodeParam begin()
-	{
-		if ( ast )
-			return { ast };
+	CodeParams& operator++();
+	AST_Params* ast;
+};
 
-		return { nullptr };
+struct CodeDefineParams
+{
+#if ! GEN_C_LIKE_CPP
+	Using_Code( CodeDefineParams );
+	FORCEINLINE void             append( CodeDefineParams other )    { return params_append( cast(CodeParams, * this), cast(CodeParams, other)); }
+	FORCEINLINE CodeDefineParams get( s32 idx )                      { return (CodeDefineParams) (Code) params_get( cast(CodeParams, * this), idx); }
+	FORCEINLINE bool             has_entries()                       { return params_has_entries( cast(CodeParams, * this)); }
+	FORCEINLINE StrBuilder       to_strbuilder()                     { return define_params_to_strbuilder(* this); }
+	FORCEINLINE void             to_strbuilder( StrBuilder& result ) { return define_params_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps( CodeDefineParams );
+	FORCEINLINE CodeDefineParams begin() { return (CodeDefineParams) (Code) begin_CodeParams( cast(CodeParams, * this)); }
+	FORCEINLINE CodeDefineParams end()   { return (CodeDefineParams) (Code) end_CodeParams( cast(CodeParams, * this)); }
+	FORCEINLINE operator Code() { return { (AST*)ast }; }
+	FORCEINLINE CodeDefineParams  operator *() { return * this; } // Required to support for-range iteration.
+	FORCEINLINE AST_DefineParams* operator->() {
+		GEN_ASSERT(ast);
+		return ast;
 	}
-	CodeParam end()
-	{
-		// return { (AST_Param*) rcast( AST*, ast)->Last };
-		return { nullptr };
-	}
-	CodeParam& operator++();
-	CodeParam operator*()
-	{
-		return * this;
-	}
-#pragma endregion Iterator
-
-	AST_Param* ast;
+	FORCEINLINE CodeDefineParams& operator++();
+	AST_DefineParams* ast;
 };
 
 struct CodeSpecifiers
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeSpecifiers );
-
-	bool append( SpecifierT spec )
-	{
-		if ( ast == nullptr )
-		{
-			log_failure("CodeSpecifiers: Attempted to append to a null specifiers AST!");
-			return false;
-		}
-
-		if ( raw()->NumEntries == AST::ArrSpecs_Cap )
-		{
-			log_failure("CodeSpecifiers: Attempted to append over %d specifiers to a specifiers AST!", AST::ArrSpecs_Cap );
-			return false;
-		}
-
-		raw()->ArrSpecs[ raw()->NumEntries ] = spec;
-		raw()->NumEntries++;
-		return true;
-	}
-	s32 has( SpecifierT spec )
-	{
-		for ( s32 idx = 0; idx < raw()->NumEntries; idx++ )
-		{
-			if ( raw()->ArrSpecs[ idx ] == spec )
-				return idx;
-		}
-
-		return -1;
-	}
-	void to_string( String& result );
-	AST* raw()
-	{
-		return rcast( AST*, ast );
-	}
-	AST_Specifiers* operator->()
-	{
-		if ( ast == nullptr )
-		{
-			log_failure("Attempt to dereference a nullptr!");
-			return nullptr;
-		}
+	bool       append( Specifier spec )            { return specifiers_append(* this, spec); }
+	s32        has( Specifier spec )               { return specifiers_has(* this, spec); }
+	s32        remove( Specifier to_remove )       { return specifiers_remove(* this, to_remove); }
+	StrBuilder to_strbuilder()                     { return specifiers_to_strbuilder(* this ); }
+	void       to_strbuilder( StrBuilder& result ) { return specifiers_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps(CodeSpecifiers);
+	FORCEINLINE operator Code() { return { (AST*) ast }; }
+	FORCEINLINE Code            operator *() { return * this; } // Required to support for-range iteration.
+	FORCEINLINE AST_Specifiers* operator->() {
+		GEN_ASSERT(ast);
 		return ast;
 	}
-	operator Code()
-	{
-		return { (AST*) ast };
-	}
-#pragma region Iterator
-	SpecifierT* begin()
-	{
-		if ( ast )
-			return & raw()->ArrSpecs[0];
-
-		return nullptr;
-	}
-	SpecifierT* end()
-	{
-		return raw()->ArrSpecs + raw()->NumEntries;
-	}
-#pragma endregion Iterator
-
 	AST_Specifiers* ast;
 };
 
-struct CodeStruct
+struct CodeAttributes
 {
-	Using_Code( CodeStruct );
-
-	void add_interface( CodeType interface );
-
-	void to_string_def( String& result );
-	void to_string_fwd( String& result );
-
-	AST* raw()
-	{
-		return rcast( AST*, ast );
-	}
-	operator Code()
-	{
-		return * rcast( Code*, this );
-	}
-	AST_Struct* operator->()
-	{
-		if ( ast == nullptr )
-		{
-			log_failure("Attempt to dereference a nullptr");
-			return nullptr;
-		}
-		return ast;
-	}
-	AST_Struct* ast;
+#if ! GEN_C_LIKE_CPP
+	Using_Code(CodeAttributes);
+	FORCEINLINE StrBuilder to_strbuilder()                   { return attributes_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder(StrBuilder& result) { return attributes_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps(CodeAttributes);
+	operator Code();
+	AST_Attributes *operator->();
+	AST_Attributes *ast;
 };
 
-#define Define_CodeType( Typename )     \
-	struct Code##Typename               \
-	{                                   \
-		Using_Code( Code ## Typename ); \
-		AST*            raw();          \
-		operator        Code();         \
-		AST_##Typename* operator->();   \
-		AST_##Typename* ast;            \
-	}
-
-Define_CodeType( Attributes );
 // Define_CodeType( BaseClass );
-Define_CodeType( Comment );
+
+struct CodeComment
+{
+#if ! GEN_C_LIKE_CPP
+	Using_Code(CodeComment);
+	FORCEINLINE StrBuilder to_strbuilder()                   { return comment_to_strbuilder    (* this); }
+	FORCEINLINE void       to_strbuilder(StrBuilder& result) { return comment_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps(CodeComment);
+	operator Code();
+	AST_Comment *operator->();
+	AST_Comment *ast;
+};
 
 struct CodeConstructor
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeConstructor );
-
-	void to_string_def( String& result );
-	void to_string_fwd( String& result );
-
-	AST*             raw();
+	FORCEINLINE StrBuilder to_strbuilder()                         { return constructor_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder_def( StrBuilder& result ) { return constructor_to_strbuilder_def(* this, & result); }
+	FORCEINLINE void       to_strbuilder_fwd( StrBuilder& result ) { return constructor_to_strbuilder_fwd(* this, & result); }
+#endif
+	Using_CodeOps(CodeConstructor);
 	operator         Code();
 	AST_Constructor* operator->();
 	AST_Constructor* ast;
@@ -1214,11 +1853,12 @@ struct CodeConstructor
 
 struct CodeDefine
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeDefine );
-
-	void to_string( String& result );
-
-	AST*        raw();
+	FORCEINLINE StrBuilder to_strbuilder()                     { return define_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result ) { return define_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps(CodeDefine);
 	operator    Code();
 	AST_Define* operator->();
 	AST_Define* ast;
@@ -1226,12 +1866,13 @@ struct CodeDefine
 
 struct CodeDestructor
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeDestructor );
-
-	void to_string_def( String& result );
-	void to_string_fwd( String& result );
-
-	AST*             raw();
+	FORCEINLINE StrBuilder to_strbuilder()                         { return destructor_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder_def( StrBuilder& result ) { return destructor_to_strbuilder_def(* this, & result); }
+	FORCEINLINE void       to_strbuilder_fwd( StrBuilder& result ) { return destructor_to_strbuilder_fwd(* this, & result); }
+#endif
+	Using_CodeOps(CodeDestructor);
 	operator         Code();
 	AST_Destructor* operator->();
 	AST_Destructor* ast;
@@ -1239,29 +1880,40 @@ struct CodeDestructor
 
 struct CodeEnum
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeEnum );
-
-	void to_string_def( String& result );
-	void to_string_fwd( String& result );
-	void to_string_class_def( String& result );
-	void to_string_class_fwd( String& result );
-
-	AST*      raw();
+	FORCEINLINE StrBuilder to_strbuilder()                                { return enum_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder_def( StrBuilder& result )        { return enum_to_strbuilder_def(* this, & result); }
+	FORCEINLINE void       to_strbuilder_fwd( StrBuilder& result )        { return enum_to_strbuilder_fwd(* this, & result); }
+	FORCEINLINE void       to_strbuilder_class_def( StrBuilder& result )  { return enum_to_strbuilder_class_def(* this, & result); }
+	FORCEINLINE void       to_strbuilder_class_fwd( StrBuilder& result )  { return enum_to_strbuilder_class_fwd(* this, & result); }
+#endif
+	Using_CodeOps(CodeEnum);
 	operator  Code();
 	AST_Enum* operator->();
 	AST_Enum* ast;
 };
 
-Define_CodeType( Exec );
+struct CodeExec
+{
+#if ! GEN_C_LIKE_CPP
+	Using_Code(CodeExec);
+	FORCEINLINE StrBuilder to_strbuilder()               { return exec_to_strbuilder(* this); }
+	FORCEINLINE void   to_strbuilder(StrBuilder& result) { return exec_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps(CodeExec);
+	operator Code();
+	AST_Exec *operator->();
+	AST_Exec *ast;
+};
 
 #if GEN_EXECUTION_EXPRESSION_SUPPORT
 struct CodeExpr
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr );
-
-	void to_string( String& result );
-
-	AST*      raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator  Code();
 	AST_Expr* operator->();
 	AST_Expr* ast;
@@ -1269,11 +1921,10 @@ struct CodeExpr
 
 struct CodeExpr_Assign
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_Assign );
-
-	void to_string( String& result );
-
-	AST*             raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator         Code();
 	AST_Expr_Assign* operator->();
 	AST_Expr_Assign* ast;
@@ -1281,11 +1932,10 @@ struct CodeExpr_Assign
 
 struct CodeExpr_Alignof
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_Alignof );
-
-	void to_string( String& result );
-
-	AST*              raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator          Code();
 	AST_Expr_Alignof* operator->();
 	AST_Expr_Alignof* ast;
@@ -1293,11 +1943,10 @@ struct CodeExpr_Alignof
 
 struct CodeExpr_Binary
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_Binary );
-
-	void to_string( String& result );
-
-	AST*             raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator         Code();
 	AST_Expr_Binary* operator->();
 	AST_Expr_Binary* ast;
@@ -1305,11 +1954,10 @@ struct CodeExpr_Binary
 
 struct CodeExpr_CStyleCast
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_CStyleCast );
-
-	void to_string( String& result );
-
-	AST*                 raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator             Code();
 	AST_Expr_CStyleCast* operator->();
 	AST_Expr_CStyleCast* ast;
@@ -1317,11 +1965,10 @@ struct CodeExpr_CStyleCast
 
 struct CodeExpr_FunctionalCast
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_FunctionalCast );
-
-	void to_string( String& result );
-
-	AST*                     raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator                 Code();
 	AST_Expr_FunctionalCast* operator->();
 	AST_Expr_FunctionalCast* ast;
@@ -1329,11 +1976,10 @@ struct CodeExpr_FunctionalCast
 
 struct CodeExpr_CppCast
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_CppCast );
-
-	void to_string( String& result );
-
-	AST*              raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator          Code();
 	AST_Expr_CppCast* operator->();
 	AST_Expr_CppCast* ast;
@@ -1341,11 +1987,10 @@ struct CodeExpr_CppCast
 
 struct CodeExpr_Element
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_Element );
-
-	void to_string( String& result );
-
-	AST*              raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator          Code();
 	AST_Expr_Element* operator->();
 	AST_Expr_Element* ast;
@@ -1353,11 +1998,10 @@ struct CodeExpr_Element
 
 struct CodeExpr_ProcCall
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_ProcCall );
-
-	void to_string( String& result );
-
-	AST*               raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator           Code();
 	AST_Expr_ProcCall* operator->();
 	AST_Expr_ProcCall* ast;
@@ -1365,11 +2009,10 @@ struct CodeExpr_ProcCall
 
 struct CodeExpr_Decltype
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_Decltype );
-
-	void to_string( String& result );
-
-	AST*      raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator  Code();
 	AST_Expr_Decltype* operator->();
 	AST_Expr_Decltype* ast;
@@ -1377,11 +2020,10 @@ struct CodeExpr_Decltype
 
 struct CodeExpr_Comma
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_Comma );
-
-	void to_string( String& result );
-
-	AST*      raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator  Code();
 	AST_Expr_Comma* operator->();
 	AST_Expr_Comma* ast;
@@ -1389,11 +2031,10 @@ struct CodeExpr_Comma
 
 struct CodeExpr_AMS
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_AMS );
-
-	void to_string( String& result );
-
-	AST*          raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator      Code();
 	AST_Expr_AMS* operator->();
 	AST_Expr_AMS* ast;
@@ -1401,11 +2042,10 @@ struct CodeExpr_AMS
 
 struct CodeExpr_Sizeof
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_Sizeof );
-
-	void to_string( String& result );
-
-	AST*             raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator         Code();
 	AST_Expr_Sizeof* operator->();
 	AST_Expr_Sizeof* ast;
@@ -1413,11 +2053,10 @@ struct CodeExpr_Sizeof
 
 struct CodeExpr_Subscript
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_Subscript );
-
-	void to_string( String& result );
-
-	AST*                raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator            Code();
 	AST_Expr_Subscript* operator->();
 	AST_Expr_Subscript* ast;
@@ -1425,11 +2064,10 @@ struct CodeExpr_Subscript
 
 struct CodeExpr_Ternary
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_Ternary );
-
-	void to_string( String& result );
-
-	AST*              raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator          Code();
 	AST_Expr_Ternary* operator->();
 	AST_Expr_Ternary* ast;
@@ -1437,11 +2075,10 @@ struct CodeExpr_Ternary
 
 struct CodeExpr_UnaryPrefix
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_UnaryPrefix );
-
-	void to_string( String& result );
-
-	AST*                  raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	operator              Code();
 	AST_Expr_UnaryPrefix* operator->();
 	AST_Expr_UnaryPrefix* ast;
@@ -1449,10 +2086,10 @@ struct CodeExpr_UnaryPrefix
 
 struct CodeExpr_UnaryPostfix
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExpr_UnaryPostfix );
-
-	void to_string( String& result );
-
+	FORCEINLINE void to_strbuilder( StrBuilder& result );
+#endif
 	AST*                   raw();
 	operator               Code();
 	AST_Expr_UnaryPostfix* operator->();
@@ -1462,11 +2099,11 @@ struct CodeExpr_UnaryPostfix
 
 struct CodeExtern
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeExtern );
-
-	void to_string( String& result );
-
-	AST*        raw();
+	FORCEINLINE void to_strbuilder( StrBuilder& result ) { return extern_to_strbuilder(* this, & result); }
+#endif
+	Using_CodeOps(CodeExtern);
 	operator    Code();
 	AST_Extern* operator->();
 	AST_Extern* ast;
@@ -1474,11 +2111,12 @@ struct CodeExtern
 
 struct CodeInclude
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeInclude );
-
-	void to_string( String& result );
-
-	AST*         raw();
+	FORCEINLINE StrBuilder to_strbuilder()                      { return include_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result )  { return include_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps(CodeInclude);
 	operator     Code();
 	AST_Include* operator->();
 	AST_Include* ast;
@@ -1486,11 +2124,12 @@ struct CodeInclude
 
 struct CodeFriend
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeFriend );
-
-	void to_string( String& result );
-
-	AST*        raw();
+	FORCEINLINE StrBuilder to_strbuilder()                     { return friend_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result ) { return friend_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps(CodeFriend);
 	operator    Code();
 	AST_Friend* operator->();
 	AST_Friend* ast;
@@ -1498,12 +2137,13 @@ struct CodeFriend
 
 struct CodeFn
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeFn );
-
-	void to_string_def( String& result );
-	void to_string_fwd( String& result );
-
-	AST*     raw();
+	FORCEINLINE StrBuilder to_strbuilder()                         { return fn_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder_def( StrBuilder& result ) { return fn_to_strbuilder_def(* this, & result); }
+	FORCEINLINE void       to_strbuilder_fwd( StrBuilder& result ) { return fn_to_strbuilder_fwd(* this, & result); }
+#endif
+	Using_CodeOps(CodeFn);
 	operator Code();
 	AST_Fn*  operator->();
 	AST_Fn*  ast;
@@ -1511,11 +2151,12 @@ struct CodeFn
 
 struct CodeModule
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeModule );
-
-	void to_string( String& result );
-
-	AST*        raw();
+	FORCEINLINE StrBuilder to_strbuilder()                     { return module_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result ) { return module_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps(CodeModule);
 	operator    Code();
 	AST_Module* operator->();
 	AST_Module* ast;
@@ -1523,11 +2164,12 @@ struct CodeModule
 
 struct CodeNS
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeNS );
-
-	void to_string( String& result );
-
-	AST*     raw();
+	FORCEINLINE StrBuilder to_strbuilder()                     { return namespace_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result ) { return namespace_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps(CodeNS);
 	operator Code();
 	AST_NS*  operator->();
 	AST_NS*  ast;
@@ -1535,12 +2177,13 @@ struct CodeNS
 
 struct CodeOperator
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeOperator );
-
-	void to_string_def( String& result );
-	void to_string_fwd( String& result );
-
-	AST*          raw();
+	FORCEINLINE StrBuilder to_strbuilder()                         { return code_op_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder_def( StrBuilder& result ) { return code_op_to_strbuilder_def(* this, & result); }
+	FORCEINLINE void       to_strbuilder_fwd( StrBuilder& result ) { return code_op_to_strbuilder_fwd(* this, & result); }
+#endif
+	Using_CodeOps(CodeOperator);
 	operator      Code();
 	AST_Operator* operator->();
 	AST_Operator* ast;
@@ -1548,12 +2191,13 @@ struct CodeOperator
 
 struct CodeOpCast
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeOpCast );
-
-	void to_string_def( String& result );
-	void to_string_fwd( String& result );
-
-	AST*        raw();
+	FORCEINLINE StrBuilder to_strbuilder()                         { return opcast_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder_def( StrBuilder& result ) { return opcast_to_strbuilder_def(* this, & result); }
+	FORCEINLINE void       to_strbuilder_fwd( StrBuilder& result ) { return opcast_to_strbuilder_fwd(* this, & result); }
+#endif
+	Using_CodeOps(CodeOpCast);
 	operator    Code();
 	AST_OpCast* operator->();
 	AST_OpCast* ast;
@@ -1561,11 +2205,12 @@ struct CodeOpCast
 
 struct CodePragma
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodePragma );
-
-	void to_string( String& result );
-
-	AST*        raw();
+	FORCEINLINE StrBuilder to_strbuilder()                     { return pragma_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result ) { return pragma_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps( CodePragma );
 	operator    Code();
 	AST_Pragma* operator->();
 	AST_Pragma* ast;
@@ -1573,16 +2218,17 @@ struct CodePragma
 
 struct CodePreprocessCond
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodePreprocessCond );
-
-	void to_string_if( String& result );
-	void to_string_ifdef( String& result );
-	void to_string_ifndef( String& result );
-	void to_string_elif( String& result );
-	void to_string_else( String& result );
-	void to_string_endif( String& result );
-
-	AST*                raw();
+	FORCEINLINE StrBuilder to_strbuilder()                            { return preprocess_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder_if( StrBuilder& result )     { return preprocess_to_strbuilder_if(* this, & result); }
+	FORCEINLINE void       to_strbuilder_ifdef( StrBuilder& result )  { return preprocess_to_strbuilder_ifdef(* this, & result); }
+	FORCEINLINE void       to_strbuilder_ifndef( StrBuilder& result ) { return preprocess_to_strbuilder_ifndef(* this, & result); }
+	FORCEINLINE void       to_strbuilder_elif( StrBuilder& result )   { return preprocess_to_strbuilder_elif(* this, & result); }
+	FORCEINLINE void       to_strbuilder_else( StrBuilder& result )   { return preprocess_to_strbuilder_else(* this, & result); }
+	FORCEINLINE void       to_strbuilder_endif( StrBuilder& result )  { return preprocess_to_strbuilder_endif(* this, & result); }
+#endif
+	Using_CodeOps( CodePreprocessCond );
 	operator            Code();
 	AST_PreprocessCond* operator->();
 	AST_PreprocessCond* ast;
@@ -1591,11 +2237,11 @@ struct CodePreprocessCond
 #if GEN_EXECUTION_EXPRESSION_SUPPORT
 struct CodeStmt
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt );
-
-	void to_string( String& result );
-
-	AST*      raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator  Code();
 	AST_Stmt* operator->();
 	AST_Stmt* ast;
@@ -1603,11 +2249,11 @@ struct CodeStmt
 
 struct CodeStmt_Break
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_Break );
-
-	void to_string( String& result );
-
-	AST*            raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator        Code();
 	AST_Stmt_Break* operator->();
 	AST_Stmt_Break* ast;
@@ -1615,11 +2261,11 @@ struct CodeStmt_Break
 
 struct CodeStmt_Case
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_Case );
-
-	void to_string( String& result );
-
-	AST*           raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator       Code();
 	AST_Stmt_Case* operator->();
 	AST_Stmt_Case* ast;
@@ -1627,11 +2273,11 @@ struct CodeStmt_Case
 
 struct CodeStmt_Continue
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_Continue );
-
-	void to_string( String& result );
-
-	AST*               raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator           Code();
 	AST_Stmt_Continue* operator->();
 	AST_Stmt_Continue* ast;
@@ -1639,11 +2285,11 @@ struct CodeStmt_Continue
 
 struct CodeStmt_Decl
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_Decl );
-
-	void to_string( String& result );
-
-	AST*           raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator       Code();
 	AST_Stmt_Decl* operator->();
 	AST_Stmt_Decl* ast;
@@ -1651,11 +2297,11 @@ struct CodeStmt_Decl
 
 struct CodeStmt_Do
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_Do );
-
-	void to_string( String& result );
-
-	AST*         raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator     Code();
 	AST_Stmt_Do* operator->();
 	AST_Stmt_Do* ast;
@@ -1663,11 +2309,11 @@ struct CodeStmt_Do
 
 struct CodeStmt_Expr
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_Expr );
-
-	void to_string( String& result );
-
-	AST*           raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator       Code();
 	AST_Stmt_Expr* operator->();
 	AST_Stmt_Expr* ast;
@@ -1675,11 +2321,11 @@ struct CodeStmt_Expr
 
 struct CodeStmt_Else
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_Else );
-
-	void to_string( String& result );
-
-	AST*           raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator       Code();
 	AST_Stmt_Else* operator->();
 	AST_Stmt_Else* ast;
@@ -1687,11 +2333,11 @@ struct CodeStmt_Else
 
 struct CodeStmt_If
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_If );
-
-	void to_string( String& result );
-
-	AST*         raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator     Code();
 	AST_Stmt_If* operator->();
 	AST_Stmt_If* ast;
@@ -1699,11 +2345,11 @@ struct CodeStmt_If
 
 struct CodeStmt_For
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_For );
-
-	void to_string( String& result );
-
-	AST*          raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator      Code();
 	AST_Stmt_For* operator->();
 	AST_Stmt_For* ast;
@@ -1711,11 +2357,11 @@ struct CodeStmt_For
 
 struct CodeStmt_Goto
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_Goto );
-
-	void to_string( String& result );
-
-	AST*           raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator       Code();
 	AST_Stmt_Goto* operator->();
 	AST_Stmt_Goto* ast;
@@ -1723,11 +2369,11 @@ struct CodeStmt_Goto
 
 struct CodeStmt_Label
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_Label );
-
-	void to_string( String& result );
-
-	AST*            raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator        Code();
 	AST_Stmt_Label* operator->();
 	AST_Stmt_Label* ast;
@@ -1735,11 +2381,11 @@ struct CodeStmt_Label
 
 struct CodeStmt_Switch
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_Switch );
-
-	void to_string( String& result );
-
-	AST*           raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator       Code();
 	AST_Stmt_Switch* operator->();
 	AST_Stmt_Switch* ast;
@@ -1747,11 +2393,11 @@ struct CodeStmt_Switch
 
 struct CodeStmt_While
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeStmt_While );
-
-	void to_string( String& result );
-
-	AST*           raw();
+	FORCEINLINE StrBuilder to_strbuilder();
+	FORCEINLINE void       to_strbuilder( StrBuilder& result );
+#endif
 	operator       Code();
 	AST_Stmt_While* operator->();
 	AST_Stmt_While* ast;
@@ -1760,35 +2406,38 @@ struct CodeStmt_While
 
 struct CodeTemplate
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeTemplate );
-
-	void to_string( String& result );
-
-	AST*          raw();
+	FORCEINLINE StrBuilder to_strbuilder()                     { return template_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result ) { return template_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps( CodeTemplate );
 	operator      Code();
 	AST_Template* operator->();
 	AST_Template* ast;
 };
 
-struct CodeType
+struct CodeTypename
 {
-	Using_Code( CodeType );
-
-	void to_string( String& result );
-
-	AST*      raw();
-	operator  Code();
-	AST_Type* operator->();
-	AST_Type* ast;
+#if ! GEN_C_LIKE_CPP
+	Using_Code( CodeTypename );
+	FORCEINLINE StrBuilder to_strbuilder()                     { return typename_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result ) { return typename_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps( CodeTypename );
+	operator      Code();
+	AST_Typename* operator->();
+	AST_Typename* ast;
 };
 
 struct CodeTypedef
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeTypedef );
-
-	void to_string( String& result );
-
-	AST*         raw();
+	FORCEINLINE StrBuilder to_strbuilder()                     { return typedef_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result ) { return typedef_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps( CodeTypedef );
 	operator     Code();
 	AST_Typedef* operator->();
 	AST_Typedef* ast;
@@ -1796,11 +2445,13 @@ struct CodeTypedef
 
 struct CodeUnion
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeUnion );
-
-	void to_string( String& result );
-
-	AST*       raw();
+	FORCEINLINE StrBuilder to_strbuilder()                         { return union_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder_def( StrBuilder& result ) { return union_to_strbuilder_def(* this, & result); }
+	FORCEINLINE void       to_strbuilder_fwd( StrBuilder& result ) { return union_to_strbuilder_fwd(* this, & result); }
+#endif
+	Using_CodeOps(CodeUnion);
 	operator   Code();
 	AST_Union* operator->();
 	AST_Union* ast;
@@ -1808,12 +2459,13 @@ struct CodeUnion
 
 struct CodeUsing
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeUsing );
-
-	void to_string( String& result );
-	void to_string_ns( String& result );
-
-	AST*       raw();
+	FORCEINLINE StrBuilder to_strbuilder()                        { return using_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result )    { return using_to_strbuilder_ref(* this, & result); }
+	FORCEINLINE void       to_strbuilder_ns( StrBuilder& result ) { return using_to_strbuilder_ns(* this, & result); }
+#endif
+	Using_CodeOps(CodeUsing);
 	operator   Code();
 	AST_Using* operator->();
 	AST_Using* ast;
@@ -1821,22 +2473,265 @@ struct CodeUsing
 
 struct CodeVar
 {
+#if ! GEN_C_LIKE_CPP
 	Using_Code( CodeVar );
-
-	void to_string( String& result );
-
-	AST*     raw();
+	FORCEINLINE StrBuilder to_strbuilder()                     { return var_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder( StrBuilder& result ) { return var_to_strbuilder_ref(* this, & result); }
+#endif
+	Using_CodeOps(CodeVar);
 	operator Code();
 	AST_Var* operator->();
 	AST_Var* ast;
 };
 
+struct CodeStruct
+{
+#if ! GEN_C_LIKE_CPP
+	Using_Code( CodeStruct );
+	FORCEINLINE void       add_interface( CodeTypename interface ) { return struct_add_interface(* this, interface); }
+	FORCEINLINE StrBuilder to_strbuilder()                         { return struct_to_strbuilder(* this); }
+	FORCEINLINE void       to_strbuilder_fwd( StrBuilder& result ) { return struct_to_strbuilder_fwd(* this, & result); }
+	FORCEINLINE void       to_strbuilder_def( StrBuilder& result ) { return struct_to_strbuilder_def(* this, & result); }
+#endif
+	Using_CodeOps( CodeStruct );
+	FORCEINLINE operator Code() { return * rcast( Code*, this ); }
+	FORCEINLINE AST_Struct* operator->() {
+		GEN_ASSERT(ast);
+		return ast;
+	}
+	AST_Struct* ast;
+};
+
 #undef Define_CodeType
 #undef Using_Code
+#undef Using_CodeOps
 
-#pragma endregion Code Types
+#undef Verify_POD
+
+struct InvalidCode_ImplictCaster
+{
+	// operator CodeBaseClass() const;
+    operator Code              () const { return Code_Invalid; }
+    operator CodeBody          () const { return cast(CodeBody,           Code_Invalid); }
+    operator CodeAttributes    () const { return cast(CodeAttributes,     Code_Invalid); }
+    operator CodeComment       () const { return cast(CodeComment,        Code_Invalid); }
+    operator CodeClass         () const { return cast(CodeClass,          Code_Invalid); }
+    operator CodeConstructor   () const { return cast(CodeConstructor,    Code_Invalid); }
+    operator CodeDefine        () const { return cast(CodeDefine,         Code_Invalid); }
+    operator CodeDefineParams  () const { return cast(CodeDefineParams,   Code_Invalid); }
+    operator CodeDestructor    () const { return cast(CodeDestructor,     Code_Invalid); }
+    operator CodeExec          () const { return cast(CodeExec,           Code_Invalid); }
+    operator CodeEnum          () const { return cast(CodeEnum,           Code_Invalid); }
+    operator CodeExtern        () const { return cast(CodeExtern,         Code_Invalid); }
+    operator CodeInclude       () const { return cast(CodeInclude,        Code_Invalid); }
+    operator CodeFriend        () const { return cast(CodeFriend,         Code_Invalid); }
+    operator CodeFn            () const { return cast(CodeFn,             Code_Invalid); }
+    operator CodeModule        () const { return cast(CodeModule,         Code_Invalid); }
+    operator CodeNS            () const { return cast(CodeNS,             Code_Invalid); }
+    operator CodeOperator      () const { return cast(CodeOperator,       Code_Invalid); }
+    operator CodeOpCast        () const { return cast(CodeOpCast,         Code_Invalid); }
+    operator CodeParams        () const { return cast(CodeParams,         Code_Invalid); }
+    operator CodePragma        () const { return cast(CodePragma,         Code_Invalid); }
+    operator CodePreprocessCond() const { return cast(CodePreprocessCond, Code_Invalid); }
+    operator CodeSpecifiers    () const { return cast(CodeSpecifiers,     Code_Invalid); }
+    operator CodeStruct        () const { return cast(CodeStruct,         Code_Invalid); }
+    operator CodeTemplate      () const { return cast(CodeTemplate,       Code_Invalid); }
+    operator CodeTypename      () const { return cast(CodeTypename,       Code_Invalid); }
+    operator CodeTypedef       () const { return cast(CodeTypedef,        Code_Invalid); }
+    operator CodeUnion         () const { return cast(CodeUnion,          Code_Invalid); }
+    operator CodeUsing         () const { return cast(CodeUsing,          Code_Invalid); }
+    operator CodeVar           () const { return cast(CodeVar,            Code_Invalid); }
+};
+
+struct NullCode_ImplicitCaster
+{
+    operator Code              () const { return {nullptr}; }
+    operator CodeBody          () const { return {(AST_Body*)      nullptr}; }
+    operator CodeAttributes    () const { return {(AST_Attributes*)nullptr}; }
+    operator CodeComment       () const { return {nullptr}; }
+    operator CodeClass         () const { return {nullptr}; }
+    operator CodeConstructor   () const { return {nullptr}; }
+    operator CodeDefine        () const { return {nullptr}; }
+    operator CodeDefineParams  () const { return {nullptr}; }
+    operator CodeDestructor    () const { return {nullptr}; }
+    operator CodeExec          () const { return {nullptr}; }
+    operator CodeEnum          () const { return {nullptr}; }
+    operator CodeExtern        () const { return {nullptr}; }
+    operator CodeInclude       () const { return {nullptr}; }
+    operator CodeFriend        () const { return {nullptr}; }
+    operator CodeFn            () const { return {nullptr}; }
+    operator CodeModule        () const { return {nullptr}; }
+    operator CodeNS            () const { return {nullptr}; }
+    operator CodeOperator      () const { return {nullptr}; }
+    operator CodeOpCast        () const { return {nullptr}; }
+    operator CodeParams        () const { return {nullptr}; }
+    operator CodePragma        () const { return {nullptr}; }
+    operator CodePreprocessCond() const { return {nullptr}; }
+    operator CodeSpecifiers    () const { return {nullptr}; }
+    operator CodeStruct        () const { return {nullptr}; }
+    operator CodeTemplate      () const { return {nullptr}; }
+    operator CodeTypename      () const { return CodeTypename{(AST_Typename*)nullptr}; }
+    operator CodeTypedef       () const { return {nullptr}; }
+    operator CodeUnion         () const { return {nullptr}; }
+    operator CodeUsing         () const { return {nullptr}; }
+    operator CodeVar           () const { return {nullptr}; }
+};
+
+FORCEINLINE Code begin( CodeBody body)                   { return begin_CodeBody(body); }
+FORCEINLINE Code end  ( CodeBody body )                  { return end_CodeBody(body); }
+FORCEINLINE Code next ( CodeBody body, Code entry_iter ) { return next_CodeBody(body, entry_iter); }
+
+FORCEINLINE CodeParams begin(CodeParams params)                        { return begin_CodeParams(params); }
+FORCEINLINE CodeParams end  (CodeParams params)                        { return end_CodeParams(params); }
+FORCEINLINE CodeParams next (CodeParams params, CodeParams entry_iter) { return next_CodeParams(params, entry_iter); }
+
+FORCEINLINE Specifier* begin(CodeSpecifiers specifiers)                       { return begin_CodeSpecifiers(specifiers); }
+FORCEINLINE Specifier* end  (CodeSpecifiers specifiers)                       { return end_CodeSpecifiers(specifiers); }
+FORCEINLINE Specifier* next (CodeSpecifiers specifiers, Specifier& spec_iter) { return next_CodeSpecifiers(specifiers, & spec_iter); }
+
+#if ! GEN_C_LIKE_CPP
+GEN_OPTIMIZE_MAPPINGS_BEGIN
+
+FORCEINLINE void       append              ( CodeBody body, Code     other )     { return body_append(body, other); }
+FORCEINLINE void       append              ( CodeBody body, CodeBody other )     { return body_append_body(body, other); }
+FORCEINLINE StrBuilder to_strbuilder       ( CodeBody body )                     { return body_to_strbuilder(body); }
+FORCEINLINE void       to_strbuilder       ( CodeBody body, StrBuilder& result ) { return body_to_strbuilder_ref(body, & result); }
+FORCEINLINE void       to_strbuilder_export( CodeBody body, StrBuilder& result ) { return body_to_strbuilder_export(body, & result); }
+
+FORCEINLINE void       add_interface    ( CodeClass self, CodeTypename interface ) { return class_add_interface(self, interface); }
+FORCEINLINE StrBuilder to_strbuilder    ( CodeClass self )                         { return class_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder_def( CodeClass self, StrBuilder& result )     { return class_to_strbuilder_def(self, & result); }
+FORCEINLINE void       to_strbuilder_fwd( CodeClass self, StrBuilder& result )     { return class_to_strbuilder_fwd(self, & result); }
+
+FORCEINLINE void             append       (CodeDefineParams appendee, CodeDefineParams other ) {        params_append(cast(CodeParams, appendee), cast(CodeParams, other)); }
+FORCEINLINE CodeDefineParams get          (CodeDefineParams params, s32 idx)                   { return (CodeDefineParams) (Code) params_get(cast(CodeParams, params), idx); }
+FORCEINLINE bool             has_entries  (CodeDefineParams params )                           { return params_has_entries(cast(CodeParams, params)); }
+FORCEINLINE StrBuilder       to_strbuilder(CodeDefineParams params )                           { return define_params_to_strbuilder(params); }
+FORCEINLINE void             to_strbuilder(CodeDefineParams params, StrBuilder& result )       { return define_params_to_strbuilder_ref(params, & result); }
+
+FORCEINLINE void       append       (CodeParams appendee, CodeParams other )   { return params_append(appendee, other); }
+FORCEINLINE CodeParams get          (CodeParams params, s32 idx)               { return params_get(params, idx); }
+FORCEINLINE bool       has_entries  (CodeParams params )                       { return params_has_entries(params); }
+FORCEINLINE StrBuilder to_strbuilder(CodeParams params )                       { return params_to_strbuilder(params); }
+FORCEINLINE void       to_strbuilder(CodeParams params, StrBuilder& result )   { return params_to_strbuilder_ref(params, & result); }
+  
+FORCEINLINE bool       append       (CodeSpecifiers specifiers, Specifier spec)       { return specifiers_append(specifiers, spec); }
+FORCEINLINE s32        has          (CodeSpecifiers specifiers, Specifier spec)       { return specifiers_has(specifiers, spec); }
+FORCEINLINE s32        remove       (CodeSpecifiers specifiers, Specifier to_remove ) { return specifiers_remove(specifiers, to_remove); }
+FORCEINLINE StrBuilder to_strbuilder(CodeSpecifiers specifiers)                       { return specifiers_to_strbuilder(specifiers); }
+FORCEINLINE void       to_strbuilder(CodeSpecifiers specifiers, StrBuilder& result)   { return specifiers_to_strbuilder_ref(specifiers, & result);  }
+
+FORCEINLINE void       add_interface    (CodeStruct self, CodeTypename interface) { return struct_add_interface(self, interface); }
+FORCEINLINE StrBuilder to_strbuilder    (CodeStruct self)                         { return struct_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder_fwd(CodeStruct self, StrBuilder& result)     { return struct_to_strbuilder_fwd(self, & result); }
+FORCEINLINE void       to_strbuilder_def(CodeStruct self, StrBuilder& result)     { return struct_to_strbuilder_def(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeAttributes attributes)                     { return attributes_to_strbuilder(attributes); }
+FORCEINLINE void       to_strbuilder(CodeAttributes attributes, StrBuilder& result) { return attributes_to_strbuilder_ref(attributes, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeComment comment )                      { return comment_to_strbuilder(comment); }
+FORCEINLINE void       to_strbuilder(CodeComment comment, StrBuilder& result )  { return comment_to_strbuilder_ref(comment, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder    (CodeConstructor constructor)                      { return constructor_to_strbuilder(constructor); }
+FORCEINLINE void       to_strbuilder_def(CodeConstructor constructor, StrBuilder& result ) { return constructor_to_strbuilder_def(constructor, & result); }
+FORCEINLINE void       to_strbuilder_fwd(CodeConstructor constructor, StrBuilder& result ) { return constructor_to_strbuilder_fwd(constructor, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeDefine self)                     { return define_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder(CodeDefine self, StrBuilder& result) { return define_to_strbuilder_ref(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder    (CodeDestructor destructor)                      { return destructor_to_strbuilder(destructor); }
+FORCEINLINE void       to_strbuilder_def(CodeDestructor destructor, StrBuilder& result ) { return destructor_to_strbuilder_def(destructor, & result); }
+FORCEINLINE void       to_strbuilder_fwd(CodeDestructor destructor, StrBuilder& result ) { return destructor_to_strbuilder_fwd(destructor, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder          (CodeEnum self)                      { return enum_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder_def      (CodeEnum self, StrBuilder& result ) { return enum_to_strbuilder_def(self, & result); }
+FORCEINLINE void       to_strbuilder_fwd      (CodeEnum self, StrBuilder& result ) { return enum_to_strbuilder_fwd(self, & result); }
+FORCEINLINE void       to_strbuilder_class_def(CodeEnum self, StrBuilder& result ) { return enum_to_strbuilder_class_def(self, & result); }
+FORCEINLINE void       to_strbuilder_class_fwd(CodeEnum self, StrBuilder& result ) { return enum_to_strbuilder_class_fwd(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeExec exec)                     { return exec_to_strbuilder(exec); }
+FORCEINLINE void       to_strbuilder(CodeExec exec, StrBuilder& result) { return exec_to_strbuilder_ref(exec, & result); }
+
+FORCEINLINE void to_strbuilder(CodeExtern self, StrBuilder& result) { return extern_to_strbuilder(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeInclude self)                     { return include_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder(CodeInclude self, StrBuilder& result) { return include_to_strbuilder_ref(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeFriend self)                     { return friend_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder(CodeFriend self, StrBuilder& result) { return friend_to_strbuilder_ref(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder    (CodeFn self)                     { return fn_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder_def(CodeFn self, StrBuilder& result) { return fn_to_strbuilder_def(self, & result); }
+FORCEINLINE void       to_strbuilder_fwd(CodeFn self, StrBuilder& result) { return fn_to_strbuilder_fwd(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeModule self)                     { return module_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder(CodeModule self, StrBuilder& result) { return module_to_strbuilder_ref(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeNS self)                     { return namespace_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder(CodeNS self, StrBuilder& result) { return namespace_to_strbuilder_ref(self,  & result); }
+
+FORCEINLINE StrBuilder to_strbuilder    (CodeOperator self)                      { return code_op_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder_fwd(CodeOperator self, StrBuilder& result ) { return code_op_to_strbuilder_fwd(self, & result); }
+FORCEINLINE void       to_strbuilder_def(CodeOperator self, StrBuilder& result ) { return code_op_to_strbuilder_def(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder    (CodeOpCast op_cast )                     { return opcast_to_strbuilder(op_cast); }
+FORCEINLINE void       to_strbuilder_def(CodeOpCast op_cast, StrBuilder& result ) { return opcast_to_strbuilder_def(op_cast, & result); }
+FORCEINLINE void       to_strbuilder_fwd(CodeOpCast op_cast, StrBuilder& result ) { return opcast_to_strbuilder_fwd(op_cast, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodePragma self)                     { return pragma_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder(CodePragma self, StrBuilder& result) { return pragma_to_strbuilder_ref(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder       (CodePreprocessCond cond)                      { return preprocess_to_strbuilder(cond); }
+FORCEINLINE void       to_strbuilder_if    (CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_if(cond, & result); }
+FORCEINLINE void       to_strbuilder_ifdef (CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_ifdef(cond, & result); }
+FORCEINLINE void       to_strbuilder_ifndef(CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_ifndef(cond, & result); }
+FORCEINLINE void       to_strbuilder_elif  (CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_elif(cond, & result); }
+FORCEINLINE void       to_strbuilder_else  (CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_else(cond, & result); }
+FORCEINLINE void       to_strbuilder_endif (CodePreprocessCond cond, StrBuilder& result ) { return preprocess_to_strbuilder_endif(cond, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeTemplate self)                     { return template_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder(CodeTemplate self, StrBuilder& result) { return template_to_strbuilder_ref(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeTypename self)                     { return typename_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder(CodeTypename self, StrBuilder& result) { return typename_to_strbuilder_ref(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeTypedef self)                      { return typedef_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder(CodeTypedef self, StrBuilder& result ) { return typedef_to_strbuilder_ref(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder    (CodeUnion self)                     { return union_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder_def(CodeUnion self, StrBuilder& result) { return union_to_strbuilder_def(self, & result); }
+FORCEINLINE void       to_strbuilder_fwd(CodeUnion self, StrBuilder& result) { return union_to_strbuilder_fwd(self, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder   (CodeUsing op_cast )                     { return using_to_strbuilder(op_cast); }
+FORCEINLINE void       to_strbuilder   (CodeUsing op_cast, StrBuilder& result ) { return using_to_strbuilder_ref(op_cast, & result); }
+FORCEINLINE void       to_strbuilder_ns(CodeUsing op_cast, StrBuilder& result ) { return using_to_strbuilder_ns(op_cast, & result); }
+
+FORCEINLINE StrBuilder to_strbuilder(CodeVar self)                     { return var_to_strbuilder(self); }
+FORCEINLINE void       to_strbuilder(CodeVar self, StrBuilder& result) { return var_to_strbuilder_ref(self, & result); }
+
+GEN_OPITMIZE_MAPPINGS_END
+#endif //if GEN_C_LIKE_CPP
+
+#pragma endregion Code Types C++
+#endif //if GEN_COMPILER_CPP
 
 #pragma region AST Types
+
+/*
+  ______   ______  ________      ________
+ /      \ /      \|        \    |        \
+|  ▓▓▓▓▓▓\  ▓▓▓▓▓▓\\▓▓▓▓▓▓▓▓     \▓▓▓▓▓▓▓▓__    __  ______   ______   _______
+| ▓▓__| ▓▓ ▓▓___\▓▓  | ▓▓          | ▓▓  |  \  |  \/      \ /      \ /       \
+| ▓▓    ▓▓\▓▓    \   | ▓▓          | ▓▓  | ▓▓  | ▓▓  ▓▓▓▓▓▓\  ▓▓▓▓▓▓\  ▓▓▓▓▓▓▓
+| ▓▓▓▓▓▓▓▓_\▓▓▓▓▓▓\  | ▓▓          | ▓▓  | ▓▓  | ▓▓ ▓▓  | ▓▓ ▓▓    ▓▓\▓▓    \
+| ▓▓  | ▓▓  \__| ▓▓  | ▓▓          | ▓▓  | ▓▓__/ ▓▓ ▓▓__/ ▓▓ ▓▓▓▓▓▓▓▓_\▓▓▓▓▓▓\
+| ▓▓  | ▓▓\▓▓    ▓▓  | ▓▓          | ▓▓   \▓▓    ▓▓ ▓▓    ▓▓\▓▓     \       ▓▓
+ \▓▓   \▓▓ \▓▓▓▓▓▓    \▓▓           \▓▓   _\▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓  \▓▓▓▓▓▓▓\▓▓▓▓▓▓▓
+                                         |  \__| ▓▓ ▓▓
+                                          \▓▓    ▓▓ ▓▓
+                                           \▓▓▓▓▓▓ \▓▓
+*/
+
 /*
 	Show only relevant members of the AST for its type.
 	AST* fields are replaced with Code types.
@@ -1845,30 +2740,33 @@ struct CodeVar
 
 struct AST_Body
 {
-	char              _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+	union {
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
+	};
+	StrCached      Name;
 	Code              Front;
 	Code              Back;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char              _PAD_UNUSED_[ sizeof(ModuleFlag) ];
 	s32 			  NumEntries;
 };
 static_assert( sizeof(AST_Body) == sizeof(AST), "ERROR: AST_Body is not the same size as AST");
 
+// TODO(Ed): Support chaining attributes (Use parameter linkage pattern)
 struct AST_Attributes
 {
 	union {
-		char          _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
-		StringCached  Content;
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
+		StrCached  Content;
 	};
+	StrCached         Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char              _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Attributes) == sizeof(AST), "ERROR: AST_Attributes is not the same size as AST");
@@ -1877,14 +2775,14 @@ static_assert( sizeof(AST_Attributes) == sizeof(AST), "ERROR: AST_Attributes is
 struct AST_BaseClass
 {
 	union {
-		char          _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char              _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_BaseClass) == sizeof(AST), "ERROR: AST_BaseClass is not the same size as AST");
@@ -1893,15 +2791,15 @@ static_assert( sizeof(AST_BaseClass) == sizeof(AST), "ERROR: AST_BaseClass is no
 struct AST_Comment
 {
 	union {
-		char          _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
-		StringCached  Content;
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
+		StrCached  Content;
 	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char              _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Comment) == sizeof(AST), "ERROR: AST_Comment is not the same size as AST");
@@ -1909,24 +2807,24 @@ static_assert( sizeof(AST_Comment) == sizeof(AST), "ERROR: AST_Comment is not th
 struct AST_Class
 {
 	union {
-		char                _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char                _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			CodeComment     InlineCmt; // Only supported by forward declarations
 			CodeAttributes  Attributes;
 			char 	        _PAD_SPECS_ [ sizeof(AST*) ];
-			CodeType        ParentType;
+			CodeTypename    ParentType;
 			char 	        _PAD_PARAMS_[ sizeof(AST*) ];
 			CodeBody        Body;
 			char 	        _PAD_PROPERTIES_2_[ sizeof(AST*) ];
 		};
 	};
-	CodeType                Prev;
-	CodeType                Next;
-	parser::Token*          Tok;
+	StrCached            Name;
+	CodeTypename            Prev;
+	CodeTypename            Next;
+	Token*                  Tok;
 	Code                    Parent;
-	StringCached            Name;
-	CodeT                   Type;
+	CodeType                Type;
 	ModuleFlag              ModuleFlags;
 	AccessSpec              ParentAccess;
 };
@@ -1935,24 +2833,24 @@ static_assert( sizeof(AST_Class) == sizeof(AST), "ERROR: AST_Class is not the sa
 struct AST_Constructor
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			CodeComment    InlineCmt; // Only supported by forward declarations
 			char           _PAD_PROPERTIES_ [ sizeof(AST*) * 1 ];
 			CodeSpecifiers Specs;
 			Code           InitializerList;
-			CodeParam      Params;
+			CodeParams     Params;
 			Code           Body;
 			char 		   _PAD_PROPERTIES_2_ [ sizeof(AST*) * 2 ];
 		};
 	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char              _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Constructor) == sizeof(AST), "ERROR: AST_Constructor is not the same size as AST");
@@ -1960,23 +2858,45 @@ static_assert( sizeof(AST_Constructor) == sizeof(AST), "ERROR: AST_Constructor i
 struct AST_Define
 {
 	union {
-		char          _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
-		StringCached  Content;
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
+		struct
+		{
+			char              _PAD_PROPERTIES_ [ sizeof(AST*) * 4 ];
+			CodeDefineParams  Params;
+			Code              Body; // Should be completely serialized for now to a: StrCached Content.
+			char              _PAD_PROPERTIES_2_ [ sizeof(AST*) * 1 ];
+		};
 	};
+	StrCached         Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char 			  _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Define) == sizeof(AST), "ERROR: AST_Define is not the same size as AST");
 
+struct AST_DefineParams
+{
+	union {
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
+	};
+	StrCached         Name;
+	CodeDefineParams  Last;
+	CodeDefineParams  Next;
+	Token*            Tok;
+	Code              Parent;
+	CodeType          Type;
+	char 			  _PAD_UNUSED_[ sizeof(ModuleFlag) ];
+	s32               NumEntries;
+};
+static_assert( sizeof(AST_DefineParams) == sizeof(AST), "ERROR: AST_DefineParams is not the same size as AST");
+
 struct AST_Destructor
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			CodeComment    InlineCmt;
@@ -1987,12 +2907,12 @@ struct AST_Destructor
 			char 		   _PAD_PROPERTIES_3_ [ sizeof(AST*) ];
 		};
 	};
+	StrCached           Name;
 	Code                   Prev;
 	Code                   Next;
-	parser::Token*         Tok;
+	Token*                 Tok;
 	Code                   Parent;
-	StringCached           Name;
-	CodeT                  Type;
+	CodeType               Type;
 	char                   _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Destructor) == sizeof(AST), "ERROR: AST_Destructor is not the same size as AST");
@@ -2000,41 +2920,41 @@ static_assert( sizeof(AST_Destructor) == sizeof(AST), "ERROR: AST_Destructor is
 struct AST_Enum
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			CodeComment    InlineCmt;
 			CodeAttributes Attributes;
 			char           _PAD_SPEC_  [ sizeof(AST*) ];
-			CodeType       UnderlyingType;
-			char	       _PAD_PARAMS_[ sizeof(AST*) ];
+			CodeTypename   UnderlyingType;
+			Code           UnderlyingTypeMacro;
 			CodeBody       Body;
 			char 	       _PAD_PROPERTIES_2_[ sizeof(AST*) ];
 		};
 	};
+	StrCached           Name;
 	Code                   Prev;
 	Code                   Next;
-	parser::Token*         Tok;
+	Token*                 Tok;
 	Code                   Parent;
-	StringCached           Name;
-	CodeT                  Type;
+	CodeType               Type;
 	ModuleFlag             ModuleFlags;
-	char 			       _PAD_UNUSED_[ sizeof(u32) ];
+	char                   _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Enum) == sizeof(AST), "ERROR: AST_Enum is not the same size as AST");
 
 struct AST_Exec
 {
 	union {
-		char          _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
-		StringCached  Content;
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
+		StrCached  Content;
 	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char              _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Exec) == sizeof(AST), "ERROR: AST_Exec is not the same size as AST");
@@ -2043,14 +2963,14 @@ static_assert( sizeof(AST_Exec) == sizeof(AST), "ERROR: AST_Exec is not the same
 struct AST_Expr
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr) == sizeof(AST), "ERROR: AST_Expr is not the same size as AST");
@@ -2058,14 +2978,14 @@ static_assert( sizeof(AST_Expr) == sizeof(AST), "ERROR: AST_Expr is not the same
 struct AST_Expr_Assign
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_Assign) == sizeof(AST), "ERROR: AST_Expr_Assign is not the same size as AST");
@@ -2073,14 +2993,14 @@ static_assert( sizeof(AST_Expr_Assign) == sizeof(AST), "ERROR: AST_Expr_Assign i
 struct AST_Expr_Alignof
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_Alignof) == sizeof(AST), "ERROR: AST_Expr_Alignof is not the same size as AST");
@@ -2088,14 +3008,14 @@ static_assert( sizeof(AST_Expr_Alignof) == sizeof(AST), "ERROR: AST_Expr_Alignof
 struct AST_Expr_Binary
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_Binary) == sizeof(AST), "ERROR: AST_Expr_Binary is not the same size as AST");
@@ -2103,14 +3023,14 @@ static_assert( sizeof(AST_Expr_Binary) == sizeof(AST), "ERROR: AST_Expr_Binary i
 struct AST_Expr_CStyleCast
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_CStyleCast) == sizeof(AST), "ERROR: AST_Expr_CStyleCast is not the same size as AST");
@@ -2118,14 +3038,14 @@ static_assert( sizeof(AST_Expr_CStyleCast) == sizeof(AST), "ERROR: AST_Expr_CSty
 struct AST_Expr_FunctionalCast
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_FunctionalCast) == sizeof(AST), "ERROR: AST_Expr_FunctionalCast is not the same size as AST");
@@ -2133,14 +3053,14 @@ static_assert( sizeof(AST_Expr_FunctionalCast) == sizeof(AST), "ERROR: AST_Expr_
 struct AST_Expr_CppCast
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_CppCast) == sizeof(AST), "ERROR: AST_Expr_CppCast is not the same size as AST");
@@ -2148,14 +3068,14 @@ static_assert( sizeof(AST_Expr_CppCast) == sizeof(AST), "ERROR: AST_Expr_CppCast
 struct AST_Expr_ProcCall
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_ProcCall) == sizeof(AST), "ERROR: AST_Expr_Identifier is not the same size as AST");
@@ -2163,14 +3083,14 @@ static_assert( sizeof(AST_Expr_ProcCall) == sizeof(AST), "ERROR: AST_Expr_Identi
 struct AST_Expr_Decltype
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_Decltype) == sizeof(AST), "ERROR: AST_Expr_Decltype is not the same size as AST");
@@ -2178,14 +3098,14 @@ static_assert( sizeof(AST_Expr_Decltype) == sizeof(AST), "ERROR: AST_Expr_Declty
 struct AST_Expr_Comma
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_Comma) == sizeof(AST), "ERROR: AST_Expr_Comma is not the same size as AST");
@@ -2193,14 +3113,14 @@ static_assert( sizeof(AST_Expr_Comma) == sizeof(AST), "ERROR: AST_Expr_Comma is
 struct AST_Expr_AMS
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_AMS) == sizeof(AST), "ERROR: AST_Expr_AMS is not the same size as AST");
@@ -2208,14 +3128,14 @@ static_assert( sizeof(AST_Expr_AMS) == sizeof(AST), "ERROR: AST_Expr_AMS is not
 struct AST_Expr_Sizeof
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_Sizeof) == sizeof(AST), "ERROR: AST_Expr_Sizeof is not the same size as AST");
@@ -2223,14 +3143,14 @@ static_assert( sizeof(AST_Expr_Sizeof) == sizeof(AST), "ERROR: AST_Expr_Sizeof i
 struct AST_Expr_Subscript
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_Subscript) == sizeof(AST), "ERROR: AST_Expr_Subscript is not the same size as AST");
@@ -2238,14 +3158,14 @@ static_assert( sizeof(AST_Expr_Subscript) == sizeof(AST), "ERROR: AST_Expr_Subsc
 struct AST_Expr_Ternary
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_Ternary) == sizeof(AST), "ERROR: AST_Expr_Ternary is not the same size as AST");
@@ -2253,14 +3173,14 @@ static_assert( sizeof(AST_Expr_Ternary) == sizeof(AST), "ERROR: AST_Expr_Ternary
 struct AST_Expr_UnaryPrefix
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_UnaryPrefix) == sizeof(AST), "ERROR: AST_Expr_UnaryPrefix is not the same size as AST");
@@ -2268,14 +3188,14 @@ static_assert( sizeof(AST_Expr_UnaryPrefix) == sizeof(AST), "ERROR: AST_Expr_Una
 struct AST_Expr_UnaryPostfix
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_UnaryPostfix) == sizeof(AST), "ERROR: AST_Expr_UnaryPostfix is not the same size as AST");
@@ -2283,14 +3203,14 @@ static_assert( sizeof(AST_Expr_UnaryPostfix) == sizeof(AST), "ERROR: AST_Expr_Un
 struct AST_Expr_Element
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Expr_Element) == sizeof(AST), "ERROR: AST_Expr_Element is not the same size as AST");
@@ -2299,7 +3219,7 @@ static_assert( sizeof(AST_Expr_Element) == sizeof(AST), "ERROR: AST_Expr_Element
 struct AST_Extern
 {
 	union {
-		char          _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			char      _PAD_PROPERTIES_[ sizeof(AST*) * 5 ];
@@ -2307,12 +3227,12 @@ struct AST_Extern
 			char      _PAD_PROPERTIES_2_[ sizeof(AST*) ];
 		};
 	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char 			  _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Extern) == sizeof(AST), "ERROR: AST_Extern is not the same size as AST");
@@ -2320,15 +3240,15 @@ static_assert( sizeof(AST_Extern) == sizeof(AST), "ERROR: AST_Extern is not the
 struct AST_Include
 {
 	union {
-		char          _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
-		StringCached  Content;
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
+		StrCached  Content;
 	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char 			  _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Include) == sizeof(AST), "ERROR: AST_Include is not the same size as AST");
@@ -2336,7 +3256,7 @@ static_assert( sizeof(AST_Include) == sizeof(AST), "ERROR: AST_Include is not th
 struct AST_Friend
 {
 	union {
-		char            _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char            _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			CodeComment InlineCmt;
@@ -2345,12 +3265,12 @@ struct AST_Friend
 			char 	    _PAD_PROPERTIES_2_[ sizeof(AST*) ];
 		};
 	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char 			  _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Friend) == sizeof(AST), "ERROR: AST_Friend is not the same size as AST");
@@ -2358,24 +3278,24 @@ static_assert( sizeof(AST_Friend) == sizeof(AST), "ERROR: AST_Friend is not the
 struct AST_Fn
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			CodeComment     InlineCmt;
 			CodeAttributes  Attributes;
 			CodeSpecifiers  Specs;
-			CodeType        ReturnType;
-			CodeParam 	    Params;
+			CodeTypename    ReturnType;
+			CodeParams 	    Params;
 			CodeBody        Body;
 			char 	        _PAD_PROPERTIES_ [ sizeof(AST*) ];
 		};
 	};
+	StrCached            Name;
 	Code                    Prev;
 	Code                    Next;
-	parser::Token*          Tok;
+	Token*                  Tok;
 	Code                    Parent;
-	StringCached            Name;
-	CodeT                   Type;
+	CodeType                Type;
 	ModuleFlag              ModuleFlags;
 	char 			        _PAD_UNUSED_[ sizeof(u32) ];
 };
@@ -2383,13 +3303,15 @@ static_assert( sizeof(AST_Fn) == sizeof(AST), "ERROR: AST_Fn is not the same siz
 
 struct AST_Module
 {
-	char              _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+	union {
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
+	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	ModuleFlag        ModuleFlags;
 	char 			  _PAD_UNUSED_[ sizeof(u32) ];
 };
@@ -2398,19 +3320,19 @@ static_assert( sizeof(AST_Module) == sizeof(AST), "ERROR: AST_Module is not the
 struct AST_NS
 {
 	union {
-		char          _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct {
 			char 	  _PAD_PROPERTIES_[ sizeof(AST*) * 5 ];
 			CodeBody  Body;
 			char 	  _PAD_PROPERTIES_2_[ sizeof(AST*) ];
 		};
 	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	ModuleFlag        ModuleFlags;
 	char 			  _PAD_UNUSED_[ sizeof(u32) ];
 };
@@ -2419,91 +3341,92 @@ static_assert( sizeof(AST_NS) == sizeof(AST), "ERROR: AST_NS is not the same siz
 struct AST_Operator
 {
 	union {
-		char                _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char                _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			CodeComment     InlineCmt;
 			CodeAttributes  Attributes;
 			CodeSpecifiers  Specs;
-			CodeType        ReturnType;
-			CodeParam 	    Params;
+			CodeTypename    ReturnType;
+			CodeParams 	    Params;
 			CodeBody        Body;
 			char 	        _PAD_PROPERTIES_ [ sizeof(AST*) ];
 		};
 	};
+	StrCached   Name;
 	Code           Prev;
 	Code           Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	ModuleFlag     ModuleFlags;
-	OperatorT      Op;
+	Operator       Op;
 };
 static_assert( sizeof(AST_Operator) == sizeof(AST), "ERROR: AST_Operator is not the same size as AST");
 
 struct AST_OpCast
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
-			CodeComment    InlineCmt;
-			char 	       _PAD_PROPERTIES_[ sizeof(AST*)  ];
-			CodeSpecifiers Specs;
-			CodeType       ValueType;
-			char 	       _PAD_PROPERTIES_2_[ sizeof(AST*) ];
-			CodeBody       Body;
-			char 	       _PAD_PROPERTIES_3_[ sizeof(AST*) ];
+			CodeComment     InlineCmt;
+			char 	        _PAD_PROPERTIES_[ sizeof(AST*)  ];
+			CodeSpecifiers  Specs;
+			CodeTypename    ValueType;
+			char 	        _PAD_PROPERTIES_2_[ sizeof(AST*) ];
+			CodeBody        Body;
+			char 	        _PAD_PROPERTIES_3_[ sizeof(AST*) ];
 		};
 	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char 			  _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_OpCast) == sizeof(AST), "ERROR: AST_OpCast is not the same size as AST");
 
-struct AST_Param
+struct AST_Params
 {
 	union {
-		char          _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
-			char 	  _PAD_PROPERTIES_2_[ sizeof(AST*) * 3 ];
-			CodeType  ValueType;
-			Code      Macro;
-			Code      Value;
-			Code     PostNameMacro; // Thanks Unreal
+			// TODO(Ed): Support attributes for parameters (Some prefix macros can be converted to that...)
+			char 	     _PAD_PROPERTIES_2_[ sizeof(AST*) * 3 ];
+			CodeTypename ValueType;
+			Code         Macro;
+			Code         Value;
+			Code         PostNameMacro; // Thanks Unreal
 			// char     _PAD_PROPERTIES_3_[sizeof( AST* )];
 		};
 	};
-	CodeParam         Last;
-	CodeParam         Next;
-	parser::Token*    Tok;
+	StrCached         Name;
+	CodeParams        Last;
+	CodeParams        Next;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char 			  _PAD_UNUSED_[ sizeof(ModuleFlag) ];
 	s32               NumEntries;
 };
-static_assert( sizeof(AST_Param) == sizeof(AST), "ERROR: AST_Param is not the same size as AST");
+static_assert( sizeof(AST_Params) == sizeof(AST), "ERROR: AST_Params is not the same size as AST");
 
 struct AST_Pragma
 {
 	union {
-		char          _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
-		StringCached  Content;
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
+		StrCached  Content;
 	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char 			  _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Pragma) == sizeof(AST), "ERROR: AST_Pragma is not the same size as AST");
@@ -2511,29 +3434,29 @@ static_assert( sizeof(AST_Pragma) == sizeof(AST), "ERROR: AST_Pragma is not the
 struct AST_PreprocessCond
 {
 	union {
-		char          _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
-		StringCached  Content;
+		char          _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
+		StrCached  Content;
 	};
+	StrCached      Name;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char 			  _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_PreprocessCond) == sizeof(AST), "ERROR: AST_PreprocessCond is not the same size as AST");
 
 struct AST_Specifiers
 {
-	SpecifierT        ArrSpecs[ AST::ArrSpecs_Cap ];
+	Specifier         ArrSpecs[ AST_ArrSpecs_Cap ];
+	StrCached      Name;
 	CodeSpecifiers    NextSpecs;
 	Code              Prev;
 	Code              Next;
-	parser::Token*    Tok;
+	Token*            Tok;
 	Code              Parent;
-	StringCached      Name;
-	CodeT             Type;
+	CodeType          Type;
 	char 			  _PAD_UNUSED_[ sizeof(ModuleFlag) ];
 	s32               NumEntries;
 };
@@ -2543,14 +3466,14 @@ static_assert( sizeof(AST_Specifiers) == sizeof(AST), "ERROR: AST_Specifier is n
 struct AST_Stmt
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt) == sizeof(AST), "ERROR: AST_Stmt is not the same size as AST");
@@ -2558,14 +3481,14 @@ static_assert( sizeof(AST_Stmt) == sizeof(AST), "ERROR: AST_Stmt is not the same
 struct AST_Stmt_Break
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_Break) == sizeof(AST), "ERROR: AST_Stmt_Break is not the same size as AST");
@@ -2573,14 +3496,14 @@ static_assert( sizeof(AST_Stmt_Break) == sizeof(AST), "ERROR: AST_Stmt_Break is
 struct AST_Stmt_Case
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_Case) == sizeof(AST), "ERROR: AST_Stmt_Case is not the same size as AST");
@@ -2588,14 +3511,14 @@ static_assert( sizeof(AST_Stmt_Case) == sizeof(AST), "ERROR: AST_Stmt_Case is no
 struct AST_Stmt_Continue
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_Continue) == sizeof(AST), "ERROR: AST_Stmt_Continue is not the same size as AST");
@@ -2603,14 +3526,14 @@ static_assert( sizeof(AST_Stmt_Continue) == sizeof(AST), "ERROR: AST_Stmt_Contin
 struct AST_Stmt_Decl
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_Decl) == sizeof(AST), "ERROR: AST_Stmt_Decl is not the same size as AST");
@@ -2618,14 +3541,14 @@ static_assert( sizeof(AST_Stmt_Decl) == sizeof(AST), "ERROR: AST_Stmt_Decl is no
 struct AST_Stmt_Do
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_Do) == sizeof(AST), "ERROR: AST_Stmt_Do is not the same size as AST");
@@ -2633,14 +3556,14 @@ static_assert( sizeof(AST_Stmt_Do) == sizeof(AST), "ERROR: AST_Stmt_Do is not th
 struct AST_Stmt_Expr
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_Expr) == sizeof(AST), "ERROR: AST_Stmt_Expr is not the same size as AST");
@@ -2648,14 +3571,14 @@ static_assert( sizeof(AST_Stmt_Expr) == sizeof(AST), "ERROR: AST_Stmt_Expr is no
 struct AST_Stmt_Else
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_Else) == sizeof(AST), "ERROR: AST_Stmt_Else is not the same size as AST");
@@ -2663,14 +3586,14 @@ static_assert( sizeof(AST_Stmt_Else) == sizeof(AST), "ERROR: AST_Stmt_Else is no
 struct AST_Stmt_If
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_If) == sizeof(AST), "ERROR: AST_Stmt_If is not the same size as AST");
@@ -2678,14 +3601,14 @@ static_assert( sizeof(AST_Stmt_If) == sizeof(AST), "ERROR: AST_Stmt_If is not th
 struct AST_Stmt_For
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_For) == sizeof(AST), "ERROR: AST_Stmt_For is not the same size as AST");
@@ -2693,14 +3616,14 @@ static_assert( sizeof(AST_Stmt_For) == sizeof(AST), "ERROR: AST_Stmt_For is not
 struct AST_Stmt_Goto
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_Goto) == sizeof(AST), "ERROR: AST_Stmt_Goto is not the same size as AST");
@@ -2708,14 +3631,14 @@ static_assert( sizeof(AST_Stmt_Goto) == sizeof(AST), "ERROR: AST_Stmt_Goto is no
 struct AST_Stmt_Label
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_Label) == sizeof(AST), "ERROR: AST_Stmt_Label is not the same size as AST");
@@ -2723,14 +3646,14 @@ static_assert( sizeof(AST_Stmt_Label) == sizeof(AST), "ERROR: AST_Stmt_Label is
 struct AST_Stmt_Switch
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_Switch) == sizeof(AST), "ERROR: AST_Stmt_Switch is not the same size as AST");
@@ -2738,14 +3661,14 @@ static_assert( sizeof(AST_Stmt_Switch) == sizeof(AST), "ERROR: AST_Stmt_Switch i
 struct AST_Stmt_While
 {
 	union {
-		char _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 	};
+	StrCached   Name;
 	CodeExpr       Prev;
 	CodeExpr       Next;
-	parser::Token* Tok;
+	Token*         Tok;
 	Code           Parent;
-	StringCached   Name;
-	CodeT          Type;
+	CodeType       Type;
 	char           _PAD_UNUSED_[ sizeof(ModuleFlag) + sizeof(u32) ];
 };
 static_assert( sizeof(AST_Stmt_While) == sizeof(AST), "ERROR: AST_Stmt_While is not the same size as AST");
@@ -2754,24 +3677,24 @@ static_assert( sizeof(AST_Stmt_While) == sizeof(AST), "ERROR: AST_Stmt_While is
 struct AST_Struct
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			CodeComment    InlineCmt;
 			CodeAttributes Attributes;
 			char 	       _PAD_SPECS_ [ sizeof(AST*) ];
-			CodeType       ParentType;
+			CodeTypename   ParentType;
 			char 	       _PAD_PARAMS_[ sizeof(AST*) ];
 			CodeBody       Body;
 			char 	       _PAD_PROPERTIES_2_[ sizeof(AST*) ];
 		};
 	};
-	CodeType               Prev;
-	CodeType               Next;
-	parser::Token*         Tok;
+	StrCached           Name;
+	CodeTypename           Prev;
+	CodeTypename           Next;
+	Token*                 Tok;
 	Code                   Parent;
-	StringCached           Name;
-	CodeT                  Type;
+	CodeType               Type;
 	ModuleFlag             ModuleFlags;
 	AccessSpec             ParentAccess;
 };
@@ -2780,21 +3703,21 @@ static_assert( sizeof(AST_Struct) == sizeof(AST), "ERROR: AST_Struct is not the
 struct AST_Template
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			char 	       _PAD_PROPERTIES_[ sizeof(AST*) * 4 ];
-			CodeParam 	   Params;
+			CodeParams 	   Params;
 			Code           Declaration;
 			char 	       _PAD_PROPERTIES_2_[ sizeof(AST*) ];
 		};
 	};
+	StrCached           Name;
 	Code                   Prev;
 	Code                   Next;
-	parser::Token*         Tok;
+	Token*                 Tok;
 	Code                   Parent;
-	StringCached           Name;
-	CodeT                  Type;
+	CodeType               Type;
 	ModuleFlag             ModuleFlags;
 	char 			       _PAD_UNUSED_[ sizeof(u32) ];
 };
@@ -2805,61 +3728,64 @@ static_assert( sizeof(AST_Template) == sizeof(AST), "ERROR: AST_Template is not
 struct AST_Type
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			char           _PAD_INLINE_CMT_[ sizeof(AST*) ];
-			CodeAttributes Attributes;
-			CodeSpecifiers Specs;
-			Code           QualifierID;
-			// CodeType       ReturnType;      // Only used for function signatures
-			// CodeParam      Params;          // Only used for function signatures
-			Code           ArrExpr;
+			CodeAttributes  Attributes;
+			CodeSpecifiers  Specs;
+			Code            QualifierID;
+			// CodeTypename ReturnType;      // Only used for function signatures
+			// CodeParams    Params;          // Only used for function signatures
+			Code            ArrExpr;
 			// CodeSpecifiers SpecsFuncSuffix; // Only used for function signatures
 		};
 	};
+	StrCached           Name;
 	Code                   Prev;
 	Code                   Next;
-	parser::Token*         Tok;
+	Token*                  Tok;
 	Code                   Parent;
-	StringCached           Name;
-	CodeT                  Type;
+	CodeType               Type;
 	char 			       _PAD_UNUSED_[ sizeof(ModuleFlag) ];
 	b32                    IsParamPack;
 };
 static_assert( sizeof(AST_Type) == sizeof(AST), "ERROR: AST_Type is not the same size as AST");
 #endif
 
-struct AST_Type
+struct AST_Typename
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			char           _PAD_INLINE_CMT_[ sizeof(AST*) ];
 			CodeAttributes Attributes;
 			CodeSpecifiers Specs;
-			CodeType       ReturnType;      // Only used for function signatures
-			CodeParam      Params;          // Only used for function signatures
+			CodeTypename   ReturnType;      // Only used for function signatures
+			CodeParams     Params;          // Only used for function signatures
 			Code           ArrExpr;
 			CodeSpecifiers SpecsFuncSuffix; // Only used for function signatures
 		};
 	};
+	StrCached           Name;
 	Code                   Prev;
 	Code                   Next;
-	parser::Token*         Tok;
+	Token*                 Tok;
 	Code                   Parent;
-	StringCached           Name;
-	CodeT                  Type;
+	CodeType               Type;
 	char 			       _PAD_UNUSED_[ sizeof(ModuleFlag) ];
-	b32                    IsParamPack;
+	struct {
+		b16                IsParamPack;   // Used by typename to know if type should be considered a parameter pack.
+		ETypenameTag       TypeTag;       // Used by typename to keep track of explicitly declared tags for the identifier (enum, struct, union)
+	};
 };
-static_assert( sizeof(AST_Type) == sizeof(AST), "ERROR: AST_Type is not the same size as AST");
+static_assert( sizeof(AST_Typename) == sizeof(AST), "ERROR: AST_Type is not the same size as AST");
 
 struct AST_Typedef
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			CodeComment    InlineCmt;
@@ -2868,12 +3794,12 @@ struct AST_Typedef
 			char 	       _PAD_PROPERTIES_2_[ sizeof(AST*) * 3 ];
 		};
 	};
+	StrCached           Name;
 	Code                   Prev;
 	Code                   Next;
-	parser::Token*         Tok;
+	Token*                 Tok;
 	Code                   Parent;
-	StringCached           Name;
-	CodeT                  Type;
+	CodeType               Type;
 	ModuleFlag             ModuleFlags;
 	b32                    IsFunction;
 };
@@ -2882,7 +3808,7 @@ static_assert( sizeof(AST_Typedef) == sizeof(AST), "ERROR: AST_Typedef is not th
 struct AST_Union
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			char           _PAD_INLINE_CMT_[ sizeof(AST*) ];
@@ -2892,12 +3818,12 @@ struct AST_Union
 			char 	       _PAD_PROPERTIES_2_[ sizeof(AST*) ];
 		};
 	};
+	StrCached           Name;
 	Code                   Prev;
 	Code                   Next;
-	parser::Token*         Tok;
+	Token*                 Tok;
 	Code                   Parent;
-	StringCached           Name;
-	CodeT                  Type;
+	CodeType               Type;
 	ModuleFlag             ModuleFlags;
 	char 			       _PAD_UNUSED_[ sizeof(u32) ];
 };
@@ -2906,22 +3832,22 @@ static_assert( sizeof(AST_Union) == sizeof(AST), "ERROR: AST_Union is not the sa
 struct AST_Using
 {
 	union {
-		char                _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char                _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			CodeComment     InlineCmt;
 			CodeAttributes  Attributes;
 			char 	        _PAD_SPECS_     [ sizeof(AST*) ];
-			CodeType        UnderlyingType;
+			CodeTypename    UnderlyingType;
 			char 	        _PAD_PROPERTIES_[ sizeof(AST*) * 3 ];
 		};
 	};
+	StrCached            Name;
 	Code                    Prev;
 	Code                    Next;
-	parser::Token*          Tok;
+	Token*                  Tok;
 	Code                    Parent;
-	StringCached            Name;
-	CodeT                   Type;
+	CodeType                Type;
 	ModuleFlag              ModuleFlags;
 	char 			        _PAD_UNUSED_[ sizeof(u32) ];
 };
@@ -2930,26 +3856,26 @@ static_assert( sizeof(AST_Using) == sizeof(AST), "ERROR: AST_Using is not the sa
 struct AST_Var
 {
 	union {
-		char               _PAD_[ sizeof(SpecifierT) * AST::ArrSpecs_Cap + sizeof(AST*) ];
+		char               _PAD_[ sizeof(Specifier) * AST_ArrSpecs_Cap + sizeof(AST*) ];
 		struct
 		{
 			CodeComment    InlineCmt;
 			CodeAttributes Attributes;
 			CodeSpecifiers Specs;
-			CodeType       ValueType;
+			CodeTypename   ValueType;
 			Code           BitfieldSize;
 			Code           Value;
 			CodeVar		   NextVar;
 		};
 	};
+	StrCached           Name;
 	Code                   Prev;
 	Code                   Next;
-	parser::Token*         Tok;
+	Token*                 Tok;
 	Code                   Parent;
-	StringCached           Name;
-	CodeT                  Type;
+	CodeType               Type;
 	ModuleFlag             ModuleFlags;
-	s32                    VarConstructorInit;
+	s32                    VarParenthesizedInit;
 };
 static_assert( sizeof(AST_Var) == sizeof(AST), "ERROR: AST_Var is not the same size as AST");
 
@@ -2958,141 +3884,297 @@ static_assert( sizeof(AST_Var) == sizeof(AST), "ERROR: AST_Var is not the same s
 #pragma endregion AST
 
 #pragma region Gen Interface
+/*
+ /      \                       |      \          |  \                      /      \
+|  ▓▓▓▓▓▓\ ______  _______       \▓▓▓▓▓▓_______  _| ▓▓_    ______   ______ |  ▓▓▓▓▓▓\ ______   _______  ______
+| ▓▓ __\▓▓/      \|       \       | ▓▓ |       \|   ▓▓ \  /      \ /      \| ▓▓_  \▓▓|      \ /       \/      \
+| ▓▓|    \  ▓▓▓▓▓▓\ ▓▓▓▓▓▓▓\      | ▓▓ | ▓▓▓▓▓▓▓\\▓▓▓▓▓▓ |  ▓▓▓▓▓▓\  ▓▓▓▓▓▓\ ▓▓ \     \▓▓▓▓▓▓\  ▓▓▓▓▓▓▓  ▓▓▓▓▓▓\
+| ▓▓ \▓▓▓▓ ▓▓    ▓▓ ▓▓  | ▓▓      | ▓▓ | ▓▓  | ▓▓ | ▓▓ __| ▓▓    ▓▓ ▓▓   \▓▓ ▓▓▓▓    /      ▓▓ ▓▓     | ▓▓    ▓▓
+| ▓▓__| ▓▓ ▓▓▓▓▓▓▓▓ ▓▓  | ▓▓     _| ▓▓_| ▓▓  | ▓▓ | ▓▓|  \ ▓▓▓▓▓▓▓▓ ▓▓     | ▓▓     |  ▓▓▓▓▓▓▓ ▓▓_____| ▓▓▓▓▓▓▓▓
+ \▓▓    ▓▓\▓▓     \ ▓▓  | ▓▓    |   ▓▓ \ ▓▓  | ▓▓  \▓▓  ▓▓\▓▓     \ ▓▓     | ▓▓      \▓▓    ▓▓\▓▓     \\▓▓     \
+  \▓▓▓▓▓▓  \▓▓▓▓▓▓▓\▓▓   \▓▓     \▓▓▓▓▓▓\▓▓   \▓▓   \▓▓▓▓  \▓▓▓▓▓▓▓\▓▓      \▓▓       \▓▓▓▓▓▓▓ \▓▓▓▓▓▓▓ \▓▓▓▓▓▓▓
+*/
 
-// Initialize the library.
-// This currently just initializes the CodePool.
-void init();
+#if 0
+enum LogLevel : u32
+{
+	Info,
+	Warning,
+	Panic,
+};
+
+struct LogEntry
+{
+	Str   msg;
+	u32   line_num;
+	void* data;
+};
+
+typedef void LoggerCallback(LogEntry entry);
+#endif
+
+// Note(Ed): This is subject to heavily change 
+// with upcoming changes to the library's fallback (default) allocations strategy;
+// and major changes to lexer/parser context usage.
+struct Context
+{
+// User Configuration
+
+// Persistent Data Allocation
+	AllocatorInfo Allocator_DyanmicContainers; // By default will use a genral slab allocator (TODO(Ed): Currently does not)
+	AllocatorInfo Allocator_Pool;              // By default will use the growing vmem reserve (TODO(Ed): Currently does not)
+	AllocatorInfo Allocator_StrCache;          // By default will use a dedicated slab allocator (TODO(Ed): Currently does not)
+
+// Temporary Allocation
+	AllocatorInfo Allocator_Temp;
+
+	// LoggerCallaback* log_callback; // TODO(Ed): Impl user logger callback as an option.
+
+	u32 Max_CommentLineLength; // Used by def_comment
+	u32 Max_StrCacheLength;    // Any cached string longer than this is always allocated again.
+
+	u32 InitSize_BuilderBuffer;
+	u32 InitSize_CodePoolsArray;
+	u32 InitSize_StringArenasArray;
+
+	u32 CodePool_NumBlocks;
+
+	// TODO(Ed): Review these... (No longer needed if using the proper allocation strategy)
+	u32 InitSize_LexerTokens;
+	u32 SizePer_StringArena;
+
+// TODO(Ed): Symbol Table
+	// Keep track of all resolved symbols (naemspaced identifiers)
+
+// Parser
+
+	// Used by the lexer to persistently treat all these identifiers as preprocessor defines.
+	// Populate with strings via gen::cache_str.
+	// Functional defines must have format: id( ;at minimum to indicate that the define is only valid with arguments.
+	MacroTable Macros;
+
+// Backend
+
+	// The fallback allocator is utilized if any fo the three above allocators is not specified by the user.
+	u32 InitSize_Fallback_Allocator_Bucket_Size;
+	Array(Arena) Fallback_AllocatorBuckets;
+
+	// Array(Token) LexerTokens;
+
+	Array(Pool)  CodePools;
+	Array(Arena) StringArenas;
+
+	StringTable StrCache;
+
+	// TODO(Ed): This needs to be just handled by a parser context
+	Array(Token) Lexer_Tokens;
+
+	// TODO(Ed): Active parse context vs a parse result need to be separated conceptually
+	ParseContext parser;
+};
+
+// Initialize the library. There first ctx initialized must exist for lifetime of other contextes that come after as its the one that
+GEN_API void init(Context* ctx);
 
 // Currently manually free's the arenas, code for checking for leaks.
 // However on Windows at least, it doesn't need to occur as the OS will clean up after the process.
-void deinit();
+GEN_API void deinit(Context* ctx);
 
-// Clears the allocations, but doesn't return to the heap, the calls init() again.
+// Clears the allocations, but doesn't free the memoery, then calls init() again.
 // Ease of use.
-void reset();
+GEN_API void reset(Context* ctx);
+
+GEN_API void set_context(Context* ctx);
+
+// Mostly intended for the parser
+GEN_API Macro* lookup_macro( Str Name );
+
+// Alternative way to add a preprocess define entry for the lexer & parser to utilize 
+// if the user doesn't want to use def_define
+// Macros are tracked by name so if the name already exists the entry will be overwritten.
+GEN_API void register_macro( Macro macro );
+
+// Ease of use batch registration
+GEN_API void register_macros( s32 num, ... );
+GEN_API void register_macros( s32 num,  Macro* macros );
 
 // Used internally to retrive or make string allocations.
 // Strings are stored in a series of string arenas of fixed size (SizePer_StringArena)
-StringCached get_cached_string( StrC str );
+GEN_API StrCached cache_str( Str str );
 
 /*
 	This provides a fresh Code AST.
 	The gen interface use this as their method from getting a new AST object from the CodePool.
 	Use this if you want to make your own API for formatting the supported Code Types.
 */
-Code make_code();
+GEN_API Code make_code();
 
 // Set these before calling gen's init() procedure.
 
-void set_allocator_data_arrays ( AllocatorInfo data_array_allocator );
-void set_allocator_code_pool   ( AllocatorInfo pool_allocator );
-void set_allocator_lexer       ( AllocatorInfo lex_allocator );
-void set_allocator_string_arena( AllocatorInfo string_allocator );
-void set_allocator_string_table( AllocatorInfo string_allocator );
-void set_allocator_type_table  ( AllocatorInfo type_reg_allocator );
-
 #pragma region Upfront
 
-CodeAttributes def_attributes( StrC content );
-CodeComment    def_comment   ( StrC content );
+GEN_API CodeAttributes def_attributes( Str content );
+GEN_API CodeComment    def_comment   ( Str content );
 
-CodeClass def_class( StrC name
-	, Code           body         = NoCode
-	, CodeType       parent       = NoCode, AccessSpec access = AccessSpec::Default
-	, CodeAttributes attributes   = NoCode
-	, ModuleFlag     mflags       = ModuleFlag::None
-	, CodeType*      interfaces   = nullptr, s32 num_interfaces = 0 );
+struct Opts_def_struct {
+	CodeBody       body;
+	CodeTypename   parent;
+	AccessSpec     parent_access;
+	CodeAttributes attributes;
+	CodeTypename*  interfaces;
+	s32            num_interfaces;
+	ModuleFlag     mflags;
+};
+GEN_API CodeClass def_class( Str name, Opts_def_struct opts GEN_PARAM_DEFAULT );
 
-CodeConstructor def_constructor( CodeParam params = NoCode, Code initializer_list = NoCode, Code body = NoCode );
+struct Opts_def_constructor {
+	CodeParams params;
+	Code      initializer_list;
+	Code      body;
+};
+GEN_API CodeConstructor def_constructor( Opts_def_constructor opts GEN_PARAM_DEFAULT );
 
-CodeDefine def_define( StrC name, StrC content );
+struct Opts_def_define {
+	CodeDefineParams params;
+	Str              content;
+	MacroFlags       flags;
+	b32              dont_register_to_preprocess_macros;
+};
+GEN_API CodeDefine def_define( Str name, MacroType type, Opts_def_define opts GEN_PARAM_DEFAULT );
 
-CodeDestructor def_destructor( Code body = NoCode, CodeSpecifiers specifiers = NoCode );
+struct Opts_def_destructor {
+	Code           body;
+	CodeSpecifiers specifiers;
+};
+GEN_API CodeDestructor def_destructor( Opts_def_destructor opts GEN_PARAM_DEFAULT );
 
-CodeEnum def_enum( StrC name
-	, Code         body      = NoCode,      CodeType       type       = NoCode
-	, EnumT        specifier = EnumRegular, CodeAttributes attributes = NoCode
-	, ModuleFlag   mflags    = ModuleFlag::None );
+struct Opts_def_enum {
+	CodeBody       body;
+	CodeTypename   type;
+	EnumT          specifier;
+	CodeAttributes attributes;
+	ModuleFlag     mflags;
+	Code           type_macro;
+};
+GEN_API CodeEnum def_enum( Str name, Opts_def_enum opts GEN_PARAM_DEFAULT );
 
-CodeExec   def_execution  ( StrC content );
-CodeExtern def_extern_link( StrC name, Code body );
-CodeFriend def_friend     ( Code symbol );
+GEN_API CodeExec   def_execution  ( Str content );
+GEN_API CodeExtern def_extern_link( Str name, CodeBody body );
+GEN_API CodeFriend def_friend     ( Code symbol );
 
-CodeFn def_function( StrC name
-	, CodeParam      params     = NoCode, CodeType       ret_type   = NoCode, Code body = NoCode
-	, CodeSpecifiers specifiers = NoCode, CodeAttributes attributes = NoCode
-	, ModuleFlag mflags     = ModuleFlag::None );
+struct Opts_def_function {
+	CodeParams      params;
+	CodeTypename    ret_type;
+	CodeBody        body;
+	CodeSpecifiers  specs;
+	CodeAttributes  attrs;
+	ModuleFlag      mflags;
+};
+GEN_API CodeFn def_function( Str name, Opts_def_function opts GEN_PARAM_DEFAULT );
 
-CodeInclude   def_include  ( StrC content, bool foreign = false );
-CodeModule    def_module   ( StrC name,            ModuleFlag mflags = ModuleFlag::None );
-CodeNS        def_namespace( StrC name, Code body, ModuleFlag mflags = ModuleFlag::None );
+struct Opts_def_include   { b32        foreign; };
+struct Opts_def_module    { ModuleFlag mflags;  };
+struct Opts_def_namespace { ModuleFlag mflags;  };
+GEN_API CodeInclude def_include  ( Str content,             Opts_def_include   opts GEN_PARAM_DEFAULT );
+GEN_API CodeModule  def_module   ( Str name,                Opts_def_module    opts GEN_PARAM_DEFAULT );
+GEN_API CodeNS      def_namespace( Str name, CodeBody body, Opts_def_namespace opts GEN_PARAM_DEFAULT );
 
-CodeOperator def_operator( OperatorT op, StrC nspace
-	, CodeParam      params     = NoCode, CodeType       ret_type   = NoCode, Code body = NoCode
-	, CodeSpecifiers specifiers = NoCode, CodeAttributes attributes = NoCode
-	, ModuleFlag     mflags     = ModuleFlag::None );
+struct Opts_def_operator {
+	CodeParams      params;
+	CodeTypename    ret_type;
+	CodeBody        body;
+	CodeSpecifiers  specifiers;
+	CodeAttributes  attributes;
+	ModuleFlag      mflags;
+};
+GEN_API CodeOperator def_operator( Operator op, Str nspace, Opts_def_operator opts GEN_PARAM_DEFAULT );
 
-CodeOpCast def_operator_cast( CodeType type, Code body = NoCode, CodeSpecifiers specs = NoCode );
+struct Opts_def_operator_cast {
+	CodeBody       body;
+	CodeSpecifiers specs;
+};
+GEN_API CodeOpCast def_operator_cast( CodeTypename type, Opts_def_operator_cast opts GEN_PARAM_DEFAULT );
 
-CodeParam  def_param ( CodeType type, StrC name, Code value = NoCode );
-CodePragma def_pragma( StrC directive );
+struct Opts_def_param { Code value; };
+GEN_API CodeParams  def_param ( CodeTypename type, Str name, Opts_def_param opts GEN_PARAM_DEFAULT );
+GEN_API CodePragma def_pragma( Str directive );
 
-CodePreprocessCond def_preprocess_cond( EPreprocessCond type, StrC content );
+GEN_API CodePreprocessCond def_preprocess_cond( EPreprocessCond type, Str content );
 
-CodeSpecifiers def_specifier( SpecifierT specifier );
+GEN_API CodeSpecifiers def_specifier( Specifier specifier );
 
-CodeStruct def_struct( StrC name
-	, Code           body       = NoCode
-	, CodeType       parent     = NoCode, AccessSpec access = AccessSpec::Default
-	, CodeAttributes attributes = NoCode
-	, ModuleFlag     mflags     = ModuleFlag::None
-	, CodeType*      interfaces = nullptr, s32 num_interfaces = 0 );
+GEN_API CodeStruct def_struct( Str name, Opts_def_struct opts GEN_PARAM_DEFAULT );
 
-CodeTemplate def_template( CodeParam params, Code definition, ModuleFlag mflags = ModuleFlag::None );
+struct Opts_def_template { ModuleFlag mflags; };
+GEN_API CodeTemplate def_template( CodeParams params, Code definition, Opts_def_template opts GEN_PARAM_DEFAULT );
 
-CodeType    def_type   ( StrC name, Code arrayexpr = NoCode, CodeSpecifiers specifiers = NoCode, CodeAttributes attributes = NoCode );
-CodeTypedef def_typedef( StrC name, Code type, CodeAttributes attributes = NoCode, ModuleFlag mflags = ModuleFlag::None );
+struct Opts_def_type {
+	ETypenameTag   type_tag;
+	Code           arrayexpr;
+	CodeSpecifiers specifiers;
+	CodeAttributes attributes;
+};
+GEN_API CodeTypename def_type( Str name, Opts_def_type opts GEN_PARAM_DEFAULT );
 
-CodeUnion def_union( StrC name, Code body, CodeAttributes attributes = NoCode, ModuleFlag mflags = ModuleFlag::None );
+struct Opts_def_typedef {
+	CodeAttributes attributes;
+	ModuleFlag     mflags;
+};
+GEN_API CodeTypedef def_typedef( Str name, Code type, Opts_def_typedef opts GEN_PARAM_DEFAULT );
 
-CodeUsing def_using( StrC name, CodeType type = NoCode
-	, CodeAttributes attributess = NoCode
-	, ModuleFlag     mflags      = ModuleFlag::None );
+struct Opts_def_union {
+	CodeAttributes attributes;
+	ModuleFlag     mflags;
+};
+GEN_API CodeUnion def_union( Str name, CodeBody body, Opts_def_union opts GEN_PARAM_DEFAULT );
 
-CodeUsing def_using_namespace( StrC name );
+struct Opts_def_using {
+	CodeAttributes attributes;
+	ModuleFlag     mflags;
+};
+GEN_API CodeUsing def_using( Str name, CodeTypename type, Opts_def_using opts GEN_PARAM_DEFAULT );
 
-CodeVar def_variable( CodeType type, StrC name, Code value = NoCode
-	, CodeSpecifiers specifiers = NoCode, CodeAttributes attributes = NoCode
-	, ModuleFlag     mflags     = ModuleFlag::None );
+GEN_API CodeUsing def_using_namespace( Str name );
+
+struct Opts_def_variable
+{
+	Code           value;
+	CodeSpecifiers specifiers;
+	CodeAttributes attributes;
+	ModuleFlag     mflags;
+};
+GEN_API CodeVar def_variable( CodeTypename type, Str name, Opts_def_variable opts GEN_PARAM_DEFAULT );
 
 // Constructs an empty body. Use AST::validate_body() to check if the body is was has valid entries.
-CodeBody def_body( CodeT type );
+GEN_API CodeBody def_body( CodeType type );
 
 // There are two options for defining a struct body, either varadically provided with the args macro to auto-deduce the arg num,
 /// or provide as an array of Code objects.
 
-CodeBody       def_class_body      ( s32 num, ... );
-CodeBody       def_class_body      ( s32 num, Code* codes );
-CodeBody       def_enum_body       ( s32 num, ... );
-CodeBody       def_enum_body       ( s32 num, Code* codes );
-CodeBody       def_export_body     ( s32 num, ... );
-CodeBody       def_export_body     ( s32 num, Code* codes);
-CodeBody       def_extern_link_body( s32 num, ... );
-CodeBody       def_extern_link_body( s32 num, Code* codes );
-CodeBody       def_function_body   ( s32 num, ... );
-CodeBody       def_function_body   ( s32 num, Code* codes );
-CodeBody       def_global_body     ( s32 num, ... );
-CodeBody       def_global_body     ( s32 num, Code* codes );
-CodeBody       def_namespace_body  ( s32 num, ... );
-CodeBody       def_namespace_body  ( s32 num, Code* codes );
-CodeParam      def_params          ( s32 num, ... );
-CodeParam      def_params          ( s32 num, CodeParam* params );
-CodeSpecifiers def_specifiers      ( s32 num, ... );
-CodeSpecifiers def_specifiers      ( s32 num, SpecifierT* specs );
-CodeBody       def_struct_body     ( s32 num, ... );
-CodeBody       def_struct_body     ( s32 num, Code* codes );
-CodeBody       def_union_body      ( s32 num, ... );
-CodeBody       def_union_body      ( s32 num, Code* codes );
+GEN_API CodeBody         def_class_body      ( s32 num, ... );
+GEN_API CodeBody         def_class_body      ( s32 num, Code* codes );
+GEN_API CodeDefineParams def_define_params   ( s32 num, ... );
+GEN_API CodeDefineParams def_define_params   ( s32 num, CodeDefineParams* codes );
+GEN_API CodeBody         def_enum_body       ( s32 num, ... );
+GEN_API CodeBody         def_enum_body       ( s32 num, Code* codes );
+GEN_API CodeBody         def_export_body     ( s32 num, ... );
+GEN_API CodeBody         def_export_body     ( s32 num, Code* codes);
+GEN_API CodeBody         def_extern_link_body( s32 num, ... );
+GEN_API CodeBody         def_extern_link_body( s32 num, Code* codes );
+GEN_API CodeBody         def_function_body   ( s32 num, ... );
+GEN_API CodeBody         def_function_body   ( s32 num, Code* codes );
+GEN_API CodeBody         def_global_body     ( s32 num, ... );
+GEN_API CodeBody         def_global_body     ( s32 num, Code* codes );
+GEN_API CodeBody         def_namespace_body  ( s32 num, ... );
+GEN_API CodeBody         def_namespace_body  ( s32 num, Code* codes );
+GEN_API CodeParams       def_params          ( s32 num, ... );
+GEN_API CodeParams       def_params          ( s32 num, CodeParams* params );
+GEN_API CodeSpecifiers   def_specifiers      ( s32 num, ... );
+GEN_API CodeSpecifiers   def_specifiers      ( s32 num, Specifier* specs );
+GEN_API CodeBody         def_struct_body     ( s32 num, ... );
+GEN_API CodeBody         def_struct_body     ( s32 num, Code* codes );
+GEN_API CodeBody         def_union_body      ( s32 num, ... );
+GEN_API CodeBody         def_union_body      ( s32 num, Code* codes );
 
 #pragma endregion Upfront
 
@@ -3101,23 +4183,21 @@ CodeBody       def_union_body      ( s32 num, Code* codes );
 // TODO(Ed) : Implmeent the new parser API design.
 
 #if 0
-namespace parser {
-	struct StackNode
-	{
-		StackNode* Prev;
+struct StackNode
+{
+	StackNode* Prev;
 
-		Token Start;
-		Token Name;       // The name of the AST node (if parsed)
-		StrC  FailedProc; // The name of the procedure that failed
-	};
-	// Stack nodes are allocated the error's allocator
+	Token Start;
+	Token Name;       // The name of the AST node (if parsed)
+	Str  FailedProc; // The name of the procedure that failed
+};
+// Stack nodes are allocated the error's allocator
 
-	struct Error
-	{
-		String     message;
-		StackNode* context_stack;
-	};
-}
+struct Error
+{
+	StrBuilder     message;
+	StackNode* context_stack;
+};
 
 struct ParseInfo
 {
@@ -3125,149 +4205,305 @@ struct ParseInfo
 	Arena TokMem;
 	Arena CodeMem;
 
-	FileContents         FileContent;
-	Array<parser::Token> Tokens;
-	Array<parser::Error> Errors;
+	FileContents FileContent;
+	Array<Token> Tokens;
+	Array<Error> Errors;
 	// Errors are allocated to a dedicated general arena.
 };
 
-CodeBody parse_file( StrC path );
+CodeBody parse_file( Str path );
 #endif
 
-CodeClass       parse_class        ( StrC class_def       );
-CodeConstructor parse_constructor  ( StrC constructor_def );
-CodeDestructor  parse_destructor   ( StrC destructor_def  );
-CodeEnum        parse_enum         ( StrC enum_def        );
-CodeBody        parse_export_body  ( StrC export_def      );
-CodeExtern      parse_extern_link  ( StrC exten_link_def  );
-CodeFriend      parse_friend       ( StrC friend_def      );
-CodeFn          parse_function     ( StrC fn_def          );
-CodeBody        parse_global_body  ( StrC body_def        );
-CodeNS          parse_namespace    ( StrC namespace_def   );
-CodeOperator    parse_operator     ( StrC operator_def    );
-CodeOpCast      parse_operator_cast( StrC operator_def    );
-CodeStruct      parse_struct       ( StrC struct_def      );
-CodeTemplate    parse_template     ( StrC template_def    );
-CodeType        parse_type         ( StrC type_def        );
-CodeTypedef     parse_typedef      ( StrC typedef_def     );
-CodeUnion       parse_union        ( StrC union_def       );
-CodeUsing       parse_using        ( StrC using_def       );
-CodeVar         parse_variable     ( StrC var_def         );
+GEN_API CodeClass       parse_class        ( Str class_def       );
+GEN_API CodeConstructor parse_constructor  ( Str constructor_def );
+GEN_API CodeDefine      parse_define       ( Str define_def      );
+GEN_API CodeDestructor  parse_destructor   ( Str destructor_def  );
+GEN_API CodeEnum        parse_enum         ( Str enum_def        );
+GEN_API CodeBody        parse_export_body  ( Str export_def      );
+GEN_API CodeExtern      parse_extern_link  ( Str exten_link_def  );
+GEN_API CodeFriend      parse_friend       ( Str friend_def      );
+GEN_API CodeFn          parse_function     ( Str fn_def          );
+GEN_API CodeBody        parse_global_body  ( Str body_def        );
+GEN_API CodeNS          parse_namespace    ( Str namespace_def   );
+GEN_API CodeOperator    parse_operator     ( Str operator_def    );
+GEN_API CodeOpCast      parse_operator_cast( Str operator_def    );
+GEN_API CodeStruct      parse_struct       ( Str struct_def      );
+GEN_API CodeTemplate    parse_template     ( Str template_def    );
+GEN_API CodeTypename    parse_type         ( Str type_def        );
+GEN_API CodeTypedef     parse_typedef      ( Str typedef_def     );
+GEN_API CodeUnion       parse_union        ( Str union_def       );
+GEN_API CodeUsing       parse_using        ( Str using_def       );
+GEN_API CodeVar         parse_variable     ( Str var_def         );
 
 #pragma endregion Parsing
 
 #pragma region Untyped text
 
-ssize   token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va );
+GEN_API ssize token_fmt_va( char* buf, usize buf_size, s32 num_tokens, va_list va );
 //! Do not use directly. Use the token_fmt macro instead.
-StrC token_fmt_impl( ssize, ... );
+GEN_API Str token_fmt_impl( ssize, ... );
 
-Code untyped_str      ( StrC content);
-Code untyped_fmt      ( char const* fmt, ... );
-Code untyped_token_fmt( char const* fmt, s32 num_tokens, ... );
+GEN_API Code untyped_str( Str content);
+GEN_API Code untyped_fmt      ( char const* fmt, ... );
+GEN_API Code untyped_token_fmt( s32 num_tokens, char const* fmt, ... );
 
 #pragma endregion Untyped text
 
+#pragma region Macros
+
+#ifndef gen_main
+#define gen_main main
+#endif
+
+#ifndef name
+//	Convienence for defining any name used with the gen api.
+//  Lets you provide the length and string literal to the functions without the need for the DSL.
+#define name( Id_ )   { stringize(Id_), sizeof(stringize( Id_ )) - 1 }
+#endif
+
+#ifndef code
+//  Same as name just used to indicate intention of literal for code instead of names.
+#define code( ... ) { stringize( __VA_ARGS__ ), sizeof(stringize(__VA_ARGS__)) - 1 }
+#endif
+
+#ifndef args
+// Provides the number of arguments while passing args inplace.
+#define args( ... ) num_args( __VA_ARGS__ ), __VA_ARGS__
+#endif
+
+#ifndef code_str
+// Just wrappers over common untyped code definition constructions.
+#define code_str( ... ) GEN_NS untyped_str( code( __VA_ARGS__ ) )
+#endif
+
+#ifndef code_fmt
+#define code_fmt( ... ) GEN_NS untyped_str( token_fmt( __VA_ARGS__ ) )
+#endif
+
+#ifndef parse_fmt
+#define parse_fmt( type, ... ) GEN_NS parse_##type( token_fmt( __VA_ARGS__ ) )
+#endif
+
+#ifndef token_fmt
+/*
+Takes a format string (char const*) and a list of tokens (Str) and returns a Str of the formatted string.
+Tokens are provided in '<'identifier'>' format where '<' '>' are just angle brackets (you can change it in token_fmt_va)
+---------------------------------------------------------
+	Example - A string with:
+		typedef <type> <name> <name>;
+	Will have a token_fmt arguments populated with:
+		"type", str_for_type,
+		"name", str_for_name,
+	and:
+		stringize( typedef <type> <name> <name>; )
+-----------------------------------------------------------
+So the full call for this example would be:
+	token_fmt(
+		"type", str_for_type
+	,	"name", str_for_name
+	,	stringize(
+		typedef <type> <name> <name>
+	));
+!----------------------------------------------------------
+! Note: token_fmt_va is whitespace sensitive for the tokens.
+! This can be alleviated by skipping whitespace between brackets but it was choosen to not have that implementation by default.
+*/
+#define token_fmt( ... ) GEN_NS token_fmt_impl( (num_args( __VA_ARGS__ ) + 1) / 2, __VA_ARGS__ )
+#endif
+
+#pragma endregion Macros
+
 #pragma endregion Gen Interface
 
 #pragma region Inlines
 
+#pragma region Code
 inline
-void AST::append( AST* other )
+void code_append( Code self, Code other )
 {
-	if ( other->Parent )
-		other = other->duplicate();
+	GEN_ASSERT(self);
+	GEN_ASSERT(other);
+	GEN_ASSERT_MSG(self != other, "Attempted to recursively append Code AST to itself.");
 
-	other->Parent = this;
+	if ( other->Parent != nullptr )
+		other = code_duplicate(other);
 
-	if ( Front == nullptr )
+	other->Parent = self;
+
+	if ( self->Front == nullptr )
 	{
-		Front = other;
-		Back  = other;
+		self->Front = other;
+		self->Back  = other;
 
-		NumEntries++;
+		self->NumEntries++;
 		return;
 	}
 
-	AST*
-		Current       = Back;
+	Code
+	Current       = self->Back;
 	Current->Next = other;
 	other->Prev   = Current;
-	Back          = other;
-	NumEntries++;
+	self->Back    = other;
+	self->NumEntries++;
 }
-
 inline
-Code& AST::entry( u32 idx )
+bool code_is_body(Code self)
 {
-	AST** current = & Front;
+	GEN_ASSERT(self);
+	switch (self->Type)
+	{
+		case CT_Enum_Body:
+		case CT_Class_Body:
+		case CT_Union_Body:
+		case CT_Export_Body:
+		case CT_Global_Body:
+		case CT_Struct_Body:
+		case CT_Function_Body:
+		case CT_Namespace_Body:
+		case CT_Extern_Linkage_Body:
+			return true;
+	}
+	return false;
+}
+inline
+Code* code_entry( Code self, u32 idx )
+{
+	GEN_ASSERT(self != nullptr);
+	Code* current = & self->Front;
 	while ( idx >= 0 && current != nullptr )
 	{
 		if ( idx == 0 )
-			return * rcast( Code*, current);
+			return rcast( Code*, current);
 
 		current = & ( * current )->Next;
 		idx--;
 	}
 
-	return * rcast( Code*, current);
+	return rcast( Code*, current);
 }
-
-inline
-bool AST::has_entries()
+FORCEINLINE
+bool code_is_valid(Code self)
 {
-	return NumEntries > 0;
+	GEN_ASSERT(self);
+	return self != nullptr && self->Type != CT_Invalid;
 }
-
-inline
-char const* AST::type_str()
+FORCEINLINE
+bool code_has_entries(AST* self)
 {
-	return ECode::to_str( Type );
+	GEN_ASSERT(self);
+	return self->NumEntries > 0;
 }
-
-inline
-AST::operator Code()
+FORCEINLINE
+void code_set_global(Code self)
 {
-	return { this };
-}
+	if ( self == nullptr )
+	{
+		log_failure("Code::set_global: Cannot set code as global, AST is null!");
+		return;
+	}
 
-inline
+	self->Parent = Code_Global;
+}
+#if GEN_COMPILER_CPP
+FORCEINLINE
 Code& Code::operator ++()
 {
 	if ( ast )
-		ast = ast->Next;
+		ast = ast->Next.ast;
 
-	return *this;
+	return * this;
 }
-
-inline
-void CodeClass::add_interface( CodeType type )
+#endif
+FORCEINLINE
+Str code_type_str(Code self)
 {
-	CodeType possible_slot = ast->ParentType;
-	if ( possible_slot.ast )
+	GEN_ASSERT(self != nullptr);
+	return codetype_to_str( self->Type );
+}
+#pragma endregion Code
+
+#pragma region CodeBody
+inline
+void body_append( CodeBody self, Code other )
+{
+	GEN_ASSERT(self);
+	GEN_ASSERT(other);
+
+	if (code_is_body(other)) {
+		body_append_body( self, cast(CodeBody, other) );
+		return;
+	}
+
+	code_append( cast(Code, self), other );
+}
+inline
+void body_append_body( CodeBody self, CodeBody body )
+{
+	GEN_ASSERT(self);
+	GEN_ASSERT(body);
+	GEN_ASSERT_MSG(self != body, "Attempted to append body to itself.");
+
+	for ( Code entry = begin_CodeBody(body); entry != end_CodeBody(body); entry = next_CodeBody(body, entry) ) {
+		body_append( self, entry );
+	}
+}
+inline
+Code begin_CodeBody( CodeBody body) {
+	GEN_ASSERT(body);
+	if ( body != nullptr )
+		return body->Front;
+
+	return NullCode;
+}
+FORCEINLINE
+Code end_CodeBody(CodeBody body ){
+	GEN_ASSERT(body);
+	return body->Back->Next;
+}
+inline
+Code next_CodeBody(CodeBody body, Code entry) {
+	GEN_ASSERT(body);
+	GEN_ASSERT(entry);
+	return entry->Next;
+}
+#pragma endregion CodeBody
+
+#pragma region CodeClass
+inline
+void class_add_interface( CodeClass self, CodeTypename type )
+{
+	GEN_ASSERT(self);
+	GEN_ASSERT(type);
+	CodeTypename possible_slot = self->ParentType;
+	if ( possible_slot != nullptr )
 	{
 		// Were adding an interface to parent type, so we need to make sure the parent type is public.
-		ast->ParentAccess = AccessSpec::Public;
+		self->ParentAccess = AccessSpec_Public;
 		// If your planning on adding a proper parent,
 		// then you'll need to move this over to ParentType->next and update ParentAccess accordingly.
 	}
 
-	while ( possible_slot.ast != nullptr )
+	while ( possible_slot != nullptr )
 	{
-		possible_slot.ast = (AST_Type*) possible_slot->Next.ast;
+		possible_slot = cast(CodeTypename, possible_slot->Next);
 	}
 
-	possible_slot.ast = type.ast;
+	possible_slot = type;
 }
+#pragma endregion CodeClass
 
+#pragma region CodeParams
 inline
-void CodeParam::append( CodeParam other )
+void params_append( CodeParams appendee, CodeParams other )
 {
-	AST* self  = (AST*) ast;
-	AST* entry = (AST*) other.ast;
+	GEN_ASSERT(appendee);
+	GEN_ASSERT(other);
+	GEN_ASSERT_MSG(appendee != other, "Attempted to append parameter to itself.");
+	Code self  = cast(Code, appendee);
+	Code entry = cast(Code, other);
 
-	if ( entry->Parent )
-		entry = entry->duplicate();
+	if ( entry->Parent != nullptr )
+		entry = code_duplicate( entry );
 
 	entry->Parent = self;
 
@@ -3283,76 +4519,208 @@ void CodeParam::append( CodeParam other )
 	self->Last       = entry;
 	self->NumEntries++;
 }
-
 inline
-CodeParam CodeParam::get( s32 idx )
+CodeParams params_get(CodeParams self, s32 idx )
 {
-	CodeParam param = *this;
+	GEN_ASSERT(self);
+	CodeParams param = self;
 	do
 	{
-		if ( ! ++ param )
-			return { nullptr };
+		if ( ++ param != nullptr )
+			return NullCode;
 
-		param = { (AST_Param*) param.raw()->Next };
+		param = cast(CodeParams, cast(Code, param)->Next);
 	}
 	while ( --idx );
 
 	return param;
 }
-
-inline
-bool CodeParam::has_entries()
+FORCEINLINE
+bool params_has_entries(CodeParams self)
 {
-	return ast->NumEntries > 0;
+	GEN_ASSERT(self);
+	return self->NumEntries > 0;
 }
-
-inline
-CodeParam& CodeParam::operator ++()
+#if GEN_COMPILER_CPP
+FORCEINLINE
+CodeParams& CodeParams::operator ++()
 {
-	ast = ast->Next.ast;
+	* this = ast->Next;
 	return * this;
 }
-
-inline
-void CodeStruct::add_interface( CodeType type )
+#endif
+FORCEINLINE
+CodeParams begin_CodeParams(CodeParams params)
 {
-	CodeType possible_slot = ast->ParentType;
-	if ( possible_slot.ast )
+	if ( params != nullptr )
+		return params;
+
+	return NullCode;
+}
+FORCEINLINE
+CodeParams end_CodeParams(CodeParams params)
+{
+	// return { (AST_Params*) rcast( AST*, ast)->Last };
+	return NullCode;
+}
+FORCEINLINE
+CodeParams next_CodeParams(CodeParams params, CodeParams param_iter)
+{
+	GEN_ASSERT(param_iter);
+	return param_iter->Next;
+}
+#pragma endregion CodeParams
+
+#pragma region CodeDefineParams
+FORCEINLINE void             define_params_append     (CodeDefineParams appendee, CodeDefineParams other ) { params_append( cast(CodeParams, appendee), cast(CodeParams, other) ); }
+FORCEINLINE CodeDefineParams define_params_get        (CodeDefineParams self, s32 idx )                    { return (CodeDefineParams) (Code) params_get( cast(CodeParams, self), idx); }
+FORCEINLINE bool             define_params_has_entries(CodeDefineParams self)                              { return params_has_entries( cast(CodeParams, self)); }
+
+CodeDefineParams begin_CodeDefineParams(CodeDefineParams params)                              { return (CodeDefineParams) (Code) begin_CodeParams( cast(CodeParams, (Code)params)); }
+CodeDefineParams end_CodeDefineParams  (CodeDefineParams params)                              { return (CodeDefineParams) (Code) end_CodeParams  ( cast(CodeParams, (Code)params)); }
+CodeDefineParams next_CodeDefineParams (CodeDefineParams params, CodeDefineParams entry_iter) { return (CodeDefineParams) (Code) next_CodeParams ( cast(CodeParams, (Code)params), cast(CodeParams, (Code)entry_iter)); }
+
+#if GEN_COMPILER_CPP
+FORCEINLINE
+CodeDefineParams& CodeDefineParams::operator ++()
+{
+	* this = ast->Next;
+	return * this;
+}
+#endif
+#pragma endregion CodeDefineParams
+
+#pragma region CodeSpecifiers
+inline
+bool specifiers_append(CodeSpecifiers self, Specifier spec )
+{
+	if ( self == nullptr )
+	{
+		log_failure("CodeSpecifiers: Attempted to append to a null specifiers AST!");
+		return false;
+	}
+	if ( self->NumEntries == AST_ArrSpecs_Cap )
+	{
+		log_failure("CodeSpecifiers: Attempted to append over %d specifiers to a specifiers AST!", AST_ArrSpecs_Cap );
+		return false;
+	}
+
+	self->ArrSpecs[ self->NumEntries ] = spec;
+	self->NumEntries++;
+	return true;
+}
+inline
+s32 specifiers_has(CodeSpecifiers self, Specifier spec)
+{
+	GEN_ASSERT(self != nullptr);
+	for ( s32 idx = 0; idx < self->NumEntries; idx++ ) {
+		if ( self->ArrSpecs[ idx ] == spec )
+			return idx;
+	}
+	return -1;
+}
+inline
+s32 specifiers_remove( CodeSpecifiers self, Specifier to_remove )
+{
+	if ( self == nullptr )
+	{
+		log_failure("CodeSpecifiers: Attempted to append to a null specifiers AST!");
+		return -1;
+	}
+	if ( self->NumEntries == AST_ArrSpecs_Cap )
+	{
+		log_failure("CodeSpecifiers: Attempted to append over %d specifiers to a specifiers AST!", AST_ArrSpecs_Cap );
+		return -1;
+	}
+
+	s32 result = -1;
+
+	s32 curr = 0;
+	s32 next = 0;
+	for(; next < self->NumEntries; ++ curr, ++ next)
+	{
+		Specifier spec = self->ArrSpecs[next];
+		if (spec == to_remove)
+		{
+			result = next;
+
+			next ++;
+			if (next >= self->NumEntries)
+				break;
+
+			spec = self->ArrSpecs[next];
+		}
+
+		self->ArrSpecs[ curr ] = spec;
+	}
+
+	if (result > -1) {
+		self->NumEntries --;
+	}
+	return result;
+}
+FORCEINLINE
+Specifier* begin_CodeSpecifiers(CodeSpecifiers self)
+{
+	if ( self != nullptr )
+		return & self->ArrSpecs[0];
+
+	return nullptr;
+}
+FORCEINLINE
+Specifier* end_CodeSpecifiers(CodeSpecifiers self)
+{
+	return self->ArrSpecs + self->NumEntries;
+}
+FORCEINLINE
+Specifier* next_CodeSpecifiers(CodeSpecifiers self, Specifier* spec_iter)
+{
+	return spec_iter + 1;
+}
+#pragma endregion CodeSpecifiers
+
+#pragma region CodeStruct
+inline
+void struct_add_interface(CodeStruct self, CodeTypename type )
+{
+	CodeTypename possible_slot = self->ParentType;
+	if ( possible_slot != nullptr )
 	{
 		// Were adding an interface to parent type, so we need to make sure the parent type is public.
-		ast->ParentAccess = AccessSpec::Public;
+		self->ParentAccess = AccessSpec_Public;
 		// If your planning on adding a proper parent,
 		// then you'll need to move this over to ParentType->next and update ParentAccess accordingly.
 	}
 
-	while ( possible_slot.ast != nullptr )
+	while ( possible_slot != nullptr )
 	{
-		possible_slot.ast = (AST_Type*) possible_slot->Next.ast;
+		possible_slot = cast(CodeTypename, possible_slot->Next);
 	}
 
-	possible_slot.ast = type.ast;
+	possible_slot = type;
 }
+#pragma endregion Code
 
+#pragma region Interface
 inline
-CodeBody def_body( CodeT type )
+CodeBody def_body( CodeType type )
 {
 	switch ( type )
 	{
-		using namespace ECode;
-		case Class_Body:
-		case Enum_Body:
-		case Export_Body:
-		case Extern_Linkage:
-		case Function_Body:
-		case Global_Body:
-		case Namespace_Body:
-		case Struct_Body:
-		case Union_Body:
+		case CT_Class_Body:
+		case CT_Enum_Body:
+		case CT_Export_Body:
+		case CT_Extern_Linkage:
+		case CT_Function_Body:
+		case CT_Global_Body:
+		case CT_Namespace_Body:
+		case CT_Struct_Body:
+		case CT_Union_Body:
 			break;
 
 		default:
-			log_failure( "def_body: Invalid type %s", (char const*)ECode::to_str(type) );
-			return (CodeBody)Code::Invalid;
+			log_failure( "def_body: Invalid type %s", codetype_to_str(type).Ptr );
+			return (CodeBody)Code_Invalid;
 	}
 
 	Code
@@ -3362,7 +4730,7 @@ CodeBody def_body( CodeT type )
 }
 
 inline
-StrC token_fmt_impl( ssize num, ... )
+Str token_fmt_impl( ssize num, ... )
 {
 	local_persist thread_local
 	char buf[GEN_PRINTF_MAXLEN] = { 0 };
@@ -3373,217 +4741,61 @@ StrC token_fmt_impl( ssize num, ... )
 	ssize result = token_fmt_va(buf, GEN_PRINTF_MAXLEN, num, va);
 	va_end(va);
 
-	return { result, buf };
+	Str str = { buf, result };
+	return str;
 }
+#pragma endregion Interface
 
 #pragma region generated code inline implementation
 
-inline char const* Code::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code Code::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool Code::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool Code::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void Code::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline Code& Code::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool Code::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool Code::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline Code::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline char const* CodeBody::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeBody::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeBody::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeBody::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeBody::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeBody& CodeBody::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeBody::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeBody::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeBody::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline char const* CodeAttributes::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeAttributes::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeAttributes::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeAttributes::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeAttributes::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeAttributes& CodeAttributes::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeAttributes::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeAttributes::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeAttributes::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeAttributes::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeAttributes::operator Code()
 {
 	return *rcast( Code*, this );
@@ -3593,84 +4805,28 @@ inline AST_Attributes* CodeAttributes::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeComment::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeComment::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeComment::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeComment::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeComment::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeComment& CodeComment::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeComment::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeComment::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeComment::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeComment::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeComment::operator Code()
 {
 	return *rcast( Code*, this );
@@ -3680,84 +4836,28 @@ inline AST_Comment* CodeComment::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeConstructor::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeConstructor::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeConstructor::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeConstructor::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeConstructor::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeConstructor& CodeConstructor::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeConstructor::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeConstructor::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeConstructor::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeConstructor::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeConstructor::operator Code()
 {
 	return *rcast( Code*, this );
@@ -3767,151 +4867,44 @@ inline AST_Constructor* CodeConstructor::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeClass::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeClass::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeClass::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeClass::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeClass::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeClass& CodeClass::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeClass::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeClass::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeClass::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline char const* CodeDefine::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeDefine::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeDefine::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeDefine::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeDefine::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeDefine& CodeDefine::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeDefine::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeDefine::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeDefine::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeDefine::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeDefine::operator Code()
 {
 	return *rcast( Code*, this );
@@ -3921,72 +4914,37 @@ inline AST_Define* CodeDefine::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeDestructor::debug_str()
+inline CodeDefineParams& CodeDefineParams::operator=( Code other )
 {
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeDestructor::duplicate()
-{
-	if ( ast == nullptr )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeDestructor::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeDestructor::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeDestructor::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
-inline CodeDestructor& CodeDestructor::operator=( Code other )
-{
-	if ( other.ast && other->Parent )
-	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeDestructor::operator==( Code other )
+inline CodeDefineParams::operator bool()
 {
-	return (AST*)ast == other.ast;
+	return ast != nullptr;
 }
 
-inline bool CodeDestructor::operator!=( Code other )
+inline CodeDestructor& CodeDestructor::operator=( Code other )
 {
-	return (AST*)ast != other.ast;
+	if ( other.ast != nullptr && other->Parent != nullptr )
+	{
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
+	}
+	ast = rcast( decltype( ast ), other.ast );
+	return *this;
 }
 
 inline CodeDestructor::operator bool()
@@ -3994,11 +4952,6 @@ inline CodeDestructor::operator bool()
 	return ast != nullptr;
 }
 
-inline AST* CodeDestructor::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeDestructor::operator Code()
 {
 	return *rcast( Code*, this );
@@ -4008,84 +4961,28 @@ inline AST_Destructor* CodeDestructor::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeEnum::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeEnum::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeEnum::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeEnum::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeEnum::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeEnum& CodeEnum::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeEnum::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeEnum::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeEnum::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeEnum::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeEnum::operator Code()
 {
 	return *rcast( Code*, this );
@@ -4095,84 +4992,28 @@ inline AST_Enum* CodeEnum::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeExec::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeExec::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeExec::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeExec::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeExec::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeExec& CodeExec::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeExec::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeExec::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeExec::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeExec::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeExec::operator Code()
 {
 	return *rcast( Code*, this );
@@ -4182,84 +5023,28 @@ inline AST_Exec* CodeExec::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeExtern::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeExtern::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeExtern::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeExtern::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeExtern::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeExtern& CodeExtern::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeExtern::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeExtern::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeExtern::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeExtern::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeExtern::operator Code()
 {
 	return *rcast( Code*, this );
@@ -4269,84 +5054,28 @@ inline AST_Extern* CodeExtern::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeFriend::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeFriend::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeFriend::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeFriend::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeFriend::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeFriend& CodeFriend::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeFriend::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeFriend::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeFriend::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeFriend::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeFriend::operator Code()
 {
 	return *rcast( Code*, this );
@@ -4356,84 +5085,28 @@ inline AST_Friend* CodeFriend::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeFn::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeFn::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeFn::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeFn::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeFn::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeFn& CodeFn::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeFn::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeFn::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeFn::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeFn::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeFn::operator Code()
 {
 	return *rcast( Code*, this );
@@ -4443,84 +5116,28 @@ inline AST_Fn* CodeFn::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeInclude::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeInclude::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeInclude::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeInclude::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeInclude::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeInclude& CodeInclude::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeInclude::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeInclude::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeInclude::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeInclude::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeInclude::operator Code()
 {
 	return *rcast( Code*, this );
@@ -4530,84 +5147,28 @@ inline AST_Include* CodeInclude::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeModule::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeModule::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeModule::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeModule::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeModule::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeModule& CodeModule::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeModule::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeModule::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeModule::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeModule::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeModule::operator Code()
 {
 	return *rcast( Code*, this );
@@ -4617,84 +5178,28 @@ inline AST_Module* CodeModule::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeNS::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeNS::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeNS::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeNS::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeNS::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeNS& CodeNS::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeNS::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeNS::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeNS::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeNS::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeNS::operator Code()
 {
 	return *rcast( Code*, this );
@@ -4704,84 +5209,28 @@ inline AST_NS* CodeNS::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeOperator::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeOperator::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeOperator::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeOperator::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeOperator::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeOperator& CodeOperator::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeOperator::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeOperator::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeOperator::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeOperator::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeOperator::operator Code()
 {
 	return *rcast( Code*, this );
@@ -4791,84 +5240,28 @@ inline AST_Operator* CodeOperator::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeOpCast::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeOpCast::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeOpCast::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeOpCast::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeOpCast::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeOpCast& CodeOpCast::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeOpCast::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeOpCast::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeOpCast::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeOpCast::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeOpCast::operator Code()
 {
 	return *rcast( Code*, this );
@@ -4878,151 +5271,44 @@ inline AST_OpCast* CodeOpCast::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeParam::debug_str()
+inline CodeParams& CodeParams::operator=( Code other )
 {
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeParam::duplicate()
-{
-	if ( ast == nullptr )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeParam::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeParam::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeParam::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
-inline CodeParam& CodeParam::operator=( Code other )
-{
-	if ( other.ast && other->Parent )
-	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeParam::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeParam::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
-inline CodeParam::operator bool()
+inline CodeParams::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline char const* CodePragma::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodePragma::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodePragma::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodePragma::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodePragma::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodePragma& CodePragma::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodePragma::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodePragma::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodePragma::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodePragma::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodePragma::operator Code()
 {
 	return *rcast( Code*, this );
@@ -5032,84 +5318,28 @@ inline AST_Pragma* CodePragma::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodePreprocessCond::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodePreprocessCond::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodePreprocessCond::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodePreprocessCond::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodePreprocessCond::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodePreprocessCond& CodePreprocessCond::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodePreprocessCond::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodePreprocessCond::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodePreprocessCond::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodePreprocessCond::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodePreprocessCond::operator Code()
 {
 	return *rcast( Code*, this );
@@ -5119,218 +5349,60 @@ inline AST_PreprocessCond* CodePreprocessCond::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeSpecifiers::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeSpecifiers::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeSpecifiers::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeSpecifiers::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeSpecifiers::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeSpecifiers& CodeSpecifiers::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeSpecifiers::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeSpecifiers::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeSpecifiers::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline char const* CodeStruct::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeStruct::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeStruct::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeStruct::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeStruct::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeStruct& CodeStruct::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeStruct::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeStruct::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeStruct::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline char const* CodeTemplate::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeTemplate::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeTemplate::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeTemplate::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeTemplate::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeTemplate& CodeTemplate::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeTemplate::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeTemplate::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeTemplate::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeTemplate::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeTemplate::operator Code()
 {
 	return *rcast( Code*, this );
@@ -5340,171 +5412,59 @@ inline AST_Template* CodeTemplate::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeType::debug_str()
+inline CodeTypename& CodeTypename::operator=( Code other )
 {
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeType::duplicate()
-{
-	if ( ast == nullptr )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeType::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeType::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeType::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
-inline CodeType& CodeType::operator=( Code other )
-{
-	if ( other.ast && other->Parent )
-	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeType::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeType::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
-inline CodeType::operator bool()
+inline CodeTypename::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeType::raw()
-{
-	return rcast( AST*, ast );
-}
-
-inline CodeType::operator Code()
+inline CodeTypename::operator Code()
 {
 	return *rcast( Code*, this );
 }
 
-inline AST_Type* CodeType::operator->()
+inline AST_Typename* CodeTypename::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeTypedef::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeTypedef::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeTypedef::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeTypedef::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeTypedef::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeTypedef& CodeTypedef::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeTypedef::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeTypedef::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeTypedef::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeTypedef::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeTypedef::operator Code()
 {
 	return *rcast( Code*, this );
@@ -5514,84 +5474,28 @@ inline AST_Typedef* CodeTypedef::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeUnion::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeUnion::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeUnion::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeUnion::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeUnion::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeUnion& CodeUnion::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeUnion::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeUnion::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeUnion::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeUnion::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeUnion::operator Code()
 {
 	return *rcast( Code*, this );
@@ -5601,84 +5505,28 @@ inline AST_Union* CodeUnion::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeUsing::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeUsing::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeUsing::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeUsing::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeUsing::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeUsing& CodeUsing::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeUsing::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeUsing::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeUsing::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeUsing::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeUsing::operator Code()
 {
 	return *rcast( Code*, this );
@@ -5688,84 +5536,28 @@ inline AST_Using* CodeUsing::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
 }
 
-inline char const* CodeVar::debug_str()
-{
-	if ( ast == nullptr )
-		return "Code::debug_str: AST is null!";
-	return rcast( AST*, ast )->debug_str();
-}
-
-inline Code CodeVar::duplicate()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::duplicate: Cannot duplicate code, AST is null!" );
-		return Code::Invalid;
-	}
-	return { rcast( AST*, ast )->duplicate() };
-}
-
-inline bool CodeVar::is_equal( Code other )
-{
-	if ( ast == nullptr || other.ast == nullptr )
-	{
-		return ast == nullptr && other.ast == nullptr;
-	}
-	return rcast( AST*, ast )->is_equal( other.ast );
-}
-
-inline bool CodeVar::is_valid()
-{
-	return (AST*)ast != nullptr && rcast( AST*, ast )->Type != CodeT::Invalid;
-}
-
-inline void CodeVar::set_global()
-{
-	if ( ast == nullptr )
-	{
-		log_failure( "Code::set_global: Cannot set code as global, AST is null!" );
-		return;
-	}
-	rcast( AST*, ast )->Parent = Code::Global.ast;
-}
-
 inline CodeVar& CodeVar::operator=( Code other )
 {
-	if ( other.ast && other->Parent )
+	if ( other.ast != nullptr && other->Parent != nullptr )
 	{
-		ast                        = rcast( decltype( ast ), other.ast->duplicate() );
-		rcast( AST*, ast )->Parent = nullptr;
+		ast         = rcast( decltype( ast ), code_duplicate( other ).ast );
+		ast->Parent = { nullptr };
 	}
 	ast = rcast( decltype( ast ), other.ast );
 	return *this;
 }
 
-inline bool CodeVar::operator==( Code other )
-{
-	return (AST*)ast == other.ast;
-}
-
-inline bool CodeVar::operator!=( Code other )
-{
-	return (AST*)ast != other.ast;
-}
-
 inline CodeVar::operator bool()
 {
 	return ast != nullptr;
 }
 
-inline AST* CodeVar::raw()
-{
-	return rcast( AST*, ast );
-}
-
 inline CodeVar::operator Code()
 {
 	return *rcast( Code*, this );
@@ -5775,7 +5567,7 @@ inline AST_Var* CodeVar::operator->()
 {
 	if ( ast == nullptr )
 	{
-		log_failure( "Attempt to dereference a nullptr!" );
+		log_failure( "Attempt to dereference a nullptr!\n" );
 		return nullptr;
 	}
 	return ast;
@@ -5784,339 +5576,161 @@ inline AST_Var* CodeVar::operator->()
 #pragma endregion generated code inline implementation
 
 #pragma region generated AST/Code cast implementation
+GEN_OPTIMIZE_MAPPINGS_BEGIN
 
-inline AST::operator CodeBody()
-{
-	return { rcast( AST_Body*, this ) };
-}
-
-inline Code::operator CodeBody() const
+FORCEINLINE Code::operator CodeBody() const
 {
 	return { (AST_Body*)ast };
 }
 
-inline AST::operator CodeAttributes()
-{
-	return { rcast( AST_Attributes*, this ) };
-}
-
-inline Code::operator CodeAttributes() const
+FORCEINLINE Code::operator CodeAttributes() const
 {
 	return { (AST_Attributes*)ast };
 }
 
-inline AST::operator CodeComment()
-{
-	return { rcast( AST_Comment*, this ) };
-}
-
-inline Code::operator CodeComment() const
+FORCEINLINE Code::operator CodeComment() const
 {
 	return { (AST_Comment*)ast };
 }
 
-inline AST::operator CodeConstructor()
-{
-	return { rcast( AST_Constructor*, this ) };
-}
-
-inline Code::operator CodeConstructor() const
+FORCEINLINE Code::operator CodeConstructor() const
 {
 	return { (AST_Constructor*)ast };
 }
 
-inline AST::operator CodeClass()
-{
-	return { rcast( AST_Class*, this ) };
-}
-
-inline Code::operator CodeClass() const
+FORCEINLINE Code::operator CodeClass() const
 {
 	return { (AST_Class*)ast };
 }
 
-inline AST::operator CodeDefine()
-{
-	return { rcast( AST_Define*, this ) };
-}
-
-inline Code::operator CodeDefine() const
+FORCEINLINE Code::operator CodeDefine() const
 {
 	return { (AST_Define*)ast };
 }
 
-inline AST::operator CodeDestructor()
+FORCEINLINE Code::operator CodeDefineParams() const
 {
-	return { rcast( AST_Destructor*, this ) };
+	return { (AST_DefineParams*)ast };
 }
 
-inline Code::operator CodeDestructor() const
+FORCEINLINE Code::operator CodeDestructor() const
 {
 	return { (AST_Destructor*)ast };
 }
 
-inline AST::operator CodeEnum()
-{
-	return { rcast( AST_Enum*, this ) };
-}
-
-inline Code::operator CodeEnum() const
+FORCEINLINE Code::operator CodeEnum() const
 {
 	return { (AST_Enum*)ast };
 }
 
-inline AST::operator CodeExec()
-{
-	return { rcast( AST_Exec*, this ) };
-}
-
-inline Code::operator CodeExec() const
+FORCEINLINE Code::operator CodeExec() const
 {
 	return { (AST_Exec*)ast };
 }
 
-inline AST::operator CodeExtern()
-{
-	return { rcast( AST_Extern*, this ) };
-}
-
-inline Code::operator CodeExtern() const
+FORCEINLINE Code::operator CodeExtern() const
 {
 	return { (AST_Extern*)ast };
 }
 
-inline AST::operator CodeFriend()
-{
-	return { rcast( AST_Friend*, this ) };
-}
-
-inline Code::operator CodeFriend() const
+FORCEINLINE Code::operator CodeFriend() const
 {
 	return { (AST_Friend*)ast };
 }
 
-inline AST::operator CodeFn()
-{
-	return { rcast( AST_Fn*, this ) };
-}
-
-inline Code::operator CodeFn() const
+FORCEINLINE Code::operator CodeFn() const
 {
 	return { (AST_Fn*)ast };
 }
 
-inline AST::operator CodeInclude()
-{
-	return { rcast( AST_Include*, this ) };
-}
-
-inline Code::operator CodeInclude() const
+FORCEINLINE Code::operator CodeInclude() const
 {
 	return { (AST_Include*)ast };
 }
 
-inline AST::operator CodeModule()
-{
-	return { rcast( AST_Module*, this ) };
-}
-
-inline Code::operator CodeModule() const
+FORCEINLINE Code::operator CodeModule() const
 {
 	return { (AST_Module*)ast };
 }
 
-inline AST::operator CodeNS()
-{
-	return { rcast( AST_NS*, this ) };
-}
-
-inline Code::operator CodeNS() const
+FORCEINLINE Code::operator CodeNS() const
 {
 	return { (AST_NS*)ast };
 }
 
-inline AST::operator CodeOperator()
-{
-	return { rcast( AST_Operator*, this ) };
-}
-
-inline Code::operator CodeOperator() const
+FORCEINLINE Code::operator CodeOperator() const
 {
 	return { (AST_Operator*)ast };
 }
 
-inline AST::operator CodeOpCast()
-{
-	return { rcast( AST_OpCast*, this ) };
-}
-
-inline Code::operator CodeOpCast() const
+FORCEINLINE Code::operator CodeOpCast() const
 {
 	return { (AST_OpCast*)ast };
 }
 
-inline AST::operator CodeParam()
+FORCEINLINE Code::operator CodeParams() const
 {
-	return { rcast( AST_Param*, this ) };
+	return { (AST_Params*)ast };
 }
 
-inline Code::operator CodeParam() const
-{
-	return { (AST_Param*)ast };
-}
-
-inline AST::operator CodePragma()
-{
-	return { rcast( AST_Pragma*, this ) };
-}
-
-inline Code::operator CodePragma() const
+FORCEINLINE Code::operator CodePragma() const
 {
 	return { (AST_Pragma*)ast };
 }
 
-inline AST::operator CodePreprocessCond()
-{
-	return { rcast( AST_PreprocessCond*, this ) };
-}
-
-inline Code::operator CodePreprocessCond() const
+FORCEINLINE Code::operator CodePreprocessCond() const
 {
 	return { (AST_PreprocessCond*)ast };
 }
 
-inline AST::operator CodeSpecifiers()
-{
-	return { rcast( AST_Specifiers*, this ) };
-}
-
-inline Code::operator CodeSpecifiers() const
+FORCEINLINE Code::operator CodeSpecifiers() const
 {
 	return { (AST_Specifiers*)ast };
 }
 
-inline AST::operator CodeStruct()
-{
-	return { rcast( AST_Struct*, this ) };
-}
-
-inline Code::operator CodeStruct() const
+FORCEINLINE Code::operator CodeStruct() const
 {
 	return { (AST_Struct*)ast };
 }
 
-inline AST::operator CodeTemplate()
-{
-	return { rcast( AST_Template*, this ) };
-}
-
-inline Code::operator CodeTemplate() const
+FORCEINLINE Code::operator CodeTemplate() const
 {
 	return { (AST_Template*)ast };
 }
 
-inline AST::operator CodeType()
+FORCEINLINE Code::operator CodeTypename() const
 {
-	return { rcast( AST_Type*, this ) };
+	return { (AST_Typename*)ast };
 }
 
-inline Code::operator CodeType() const
-{
-	return { (AST_Type*)ast };
-}
-
-inline AST::operator CodeTypedef()
-{
-	return { rcast( AST_Typedef*, this ) };
-}
-
-inline Code::operator CodeTypedef() const
+FORCEINLINE Code::operator CodeTypedef() const
 {
 	return { (AST_Typedef*)ast };
 }
 
-inline AST::operator CodeUnion()
-{
-	return { rcast( AST_Union*, this ) };
-}
-
-inline Code::operator CodeUnion() const
+FORCEINLINE Code::operator CodeUnion() const
 {
 	return { (AST_Union*)ast };
 }
 
-inline AST::operator CodeUsing()
-{
-	return { rcast( AST_Using*, this ) };
-}
-
-inline Code::operator CodeUsing() const
+FORCEINLINE Code::operator CodeUsing() const
 {
 	return { (AST_Using*)ast };
 }
 
-inline AST::operator CodeVar()
-{
-	return { rcast( AST_Var*, this ) };
-}
-
-inline Code::operator CodeVar() const
+FORCEINLINE Code::operator CodeVar() const
 {
 	return { (AST_Var*)ast };
 }
 
+GEN_OPITMIZE_MAPPINGS_END
 #pragma endregion generated AST / Code cast implementation
 
 #pragma endregion Inlines
 
 #pragma region Constants
 
-#ifndef GEN_GLOBAL_BUCKET_SIZE
-#	define GEN_GLOBAL_BUCKET_SIZE megabytes(8)
-#endif
-#ifndef GEN_CODEPOOL_NUM_BLOCKS
-#	define GEN_CODEPOOL_NUM_BLOCKS kilobytes(16)
-#endif
-#ifndef GEN_SIZE_PER_STRING_ARENA
-#	define GEN_SIZE_PER_STRING_ARENA megabytes(1)
-#endif
-#ifndef GEN_MAX_COMMENT_LINE_LENGTH
-#	define GEN_MAX_COMMENT_LINE_LENGTH 1024
-#endif
-#ifndef GEN_MAX_NAME_LENGTH
-#	define GEN_MAX_NAME_LENGTH 128
-#endif
-#ifndef GEN_MAX_UNTYPED_STR_LENGTH
-#	define GEN_MAX_UNTYPED_STR_LENGTH megabytes(1)
-#endif
-#ifndef GEN_TOKEN_FMT_TOKEN_MAP_MEM_SIZE
-#	define GEN_TOKEN_FMT_TOKEN_MAP_MEM_SIZE kilobytes(4)
-#endif
-#ifndef GEN_LEX_ALLOCATOR_SIZE
-#	define GEN_LEX_ALLOCATOR_SIZE megabytes(4)
-#endif
-#ifndef GEN_BUILDER_STR_BUFFER_RESERVE
-#	define GEN_BUILDER_STR_BUFFER_RESERVE megabytes(2)
-#endif
-
-// These constexprs are used for allocation behavior of data structures
-// or string handling while constructing or serializing.
-// Change them to suit your needs.
-
-constexpr s32 InitSize_DataArrays = 16;
-
-// NOTE: This limits the maximum size of an allocation
-// If you are generating a string larger than this, increase the size of the bucket here.
-constexpr usize  Global_BucketSize         = GEN_GLOBAL_BUCKET_SIZE;
-constexpr s32 CodePool_NumBlocks        = GEN_CODEPOOL_NUM_BLOCKS;
-constexpr s32 SizePer_StringArena       = GEN_SIZE_PER_STRING_ARENA;
-
-constexpr s32 MaxCommentLineLength      = GEN_MAX_COMMENT_LINE_LENGTH;
-constexpr s32 MaxNameLength             = GEN_MAX_NAME_LENGTH;
-constexpr s32 MaxUntypedStrLength       = GEN_MAX_UNTYPED_STR_LENGTH;
-constexpr s32 TokenFmt_TokenMap_MemSize	= GEN_TOKEN_FMT_TOKEN_MAP_MEM_SIZE;
-constexpr s32 LexAllocator_Size         = GEN_LEX_ALLOCATOR_SIZE;
-constexpr s32 Builder_StrBufferReserve  = GEN_BUILDER_STR_BUFFER_RESERVE;
+extern Macro enum_underlying_macro;
 
 extern Code access_public;
 extern Code access_protected;
@@ -6132,7 +5746,7 @@ extern Code fmt_newline;
 
 extern CodePragma pragma_once;
 
-extern CodeParam param_varadic;
+extern CodeParams param_varadic;
 
 extern CodePreprocessCond preprocess_else;
 extern CodePreprocessCond preprocess_endif;
@@ -6162,89 +5776,41 @@ extern CodeSpecifiers spec_thread_local;
 extern CodeSpecifiers spec_virtual;
 extern CodeSpecifiers spec_volatile;
 
-extern CodeType t_empty; // Used with varaidc parameters. (Exposing just in case its useful for another circumstance)
-extern CodeType t_auto;
-extern CodeType t_void;
-extern CodeType t_int;
-extern CodeType t_bool;
-extern CodeType t_char;
-extern CodeType t_wchar_t;
-extern CodeType t_class;
-extern CodeType t_typename;
+extern CodeTypename t_empty; // Used with varaidc parameters. (Exposing just in case its useful for another circumstance)
+extern CodeTypename t_auto;
+extern CodeTypename t_void;
+extern CodeTypename t_int;
+extern CodeTypename t_bool;
+extern CodeTypename t_char;
+extern CodeTypename t_wchar_t;
+extern CodeTypename t_class;
+extern CodeTypename t_typename;
 
 #ifdef GEN_DEFINE_LIBRARY_CODE_CONSTANTS
 	// Predefined typename codes. Are set to readonly and are setup during gen::init()
+	extern Context* _ctx;
 
-	extern CodeType t_b32;
+	extern CodeTypename t_b32;
 
-	extern CodeType t_s8;
-	extern CodeType t_s16;
-	extern CodeType t_s32;
-	extern CodeType t_s64;
+	extern CodeTypename t_s8;
+	extern CodeTypename t_s16;
+	extern CodeTypename t_s32;
+	extern CodeTypename t_s64;
 
-	extern CodeType t_u8;
-	extern CodeType t_u16;
-	extern CodeType t_u32;
-	extern CodeType t_u64;
+	extern CodeTypename t_u8;
+	extern CodeTypename t_u16;
+	extern CodeTypename t_u32;
+	extern CodeTypename t_u64;
 
-	extern CodeType t_ssize;
-	extern CodeType t_usize;
+	extern CodeTypename t_ssize;
+	extern CodeTypename t_usize;
 
-	extern CodeType t_f32;
-	extern CodeType t_f64;
+	extern CodeTypename t_f32;
+	extern CodeTypename t_f64;
 #endif
 
 #pragma endregion Constants
 
-#pragma region Macros
-
-#	define gen_main main
-
-#	define __ NoCode
-
-	//	Convienence for defining any name used with the gen api.
-	//  Lets you provide the length and string literal to the functions without the need for the DSL.
-#	define name( Id_ )   { sizeof(stringize( Id_ )) - 1, stringize(Id_) }
-
-	//  Same as name just used to indicate intention of literal for code instead of names.
-#	define code( ... ) { sizeof(stringize(__VA_ARGS__)) - 1, stringize( __VA_ARGS__ ) }
-
-#	define args( ... ) num_args( __VA_ARGS__ ), __VA_ARGS__
-
-#	define code_str( ... ) GEN_NS untyped_str( code( __VA_ARGS__ ) )
-#	define code_fmt( ... ) GEN_NS untyped_str( token_fmt( __VA_ARGS__ ) )
-
-	// Takes a format string (char const*) and a list of tokens (StrC) and returns a StrC of the formatted string.
-#	define token_fmt( ... ) GEN_NS token_fmt_impl( (num_args( __VA_ARGS__ ) + 1) / 2, __VA_ARGS__ )
-
-#pragma endregion Macros
-
-// Used by the lexer to persistently treat all these identifiers as preprocessor defines.
-// Populate with strings via gen::get_cached_string.
-// Functional defines must have format: id( ;at minimum to indicate that the define is only valid with arguments.
-extern Array< StringCached > PreprocessorDefines;
-
-#ifdef GEN_EXPOSE_BACKEND
-
-	// Global allocator used for data with process lifetime.
-	extern AllocatorInfo  GlobalAllocator;
-	extern Array< Arena > Global_AllocatorBuckets;
-
-	extern Array< Pool >  CodePools;
-	extern Array< Arena > StringArenas;
-
-	extern StringTable StringCache;
-
-	extern Arena LexArena;
-
-	extern AllocatorInfo Allocator_DataArrays;
-	extern AllocatorInfo Allocator_CodePool;
-	extern AllocatorInfo Allocator_Lexer;
-	extern AllocatorInfo Allocator_StringArena;
-	extern AllocatorInfo Allocator_StringTable;
-	extern AllocatorInfo Allocator_TypeTable;
-
-#endif
 GEN_NS_END
 
 #ifdef __clang__
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/gen.scanner.cpp b/Project/Source/GasaEditor/GasaGen/gencpp/gen.scanner.cpp
index 45ca836..177f619 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/gen.scanner.cpp
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/gen.scanner.cpp
@@ -9,6 +9,9 @@
 #   pragma clang diagnostic ignored "-Wunknown-pragmas"
 #	pragma clang diagnostic ignored "-Wvarargs"
 #	pragma clang diagnostic ignored "-Wunused-function"
+#	pragma clang diagnostic ignored "-Wbraced-scalar-init"
+#   pragma clang diagnostic ignored "-W#pragma-messages"
+#	pragma clang diagnostic ignored "-Wstatic-in-inline"
 #endif
 
 #ifdef __GNUC__
@@ -28,7 +31,7 @@ GEN_NS_BEGIN
 #define _adt_fprintf( s_, fmt_, ... )                      \
 	do                                                     \
 	{                                                      \
-		if ( str_fmt_file( s_, fmt_, ##__VA_ARGS__ ) < 0 ) \
+		if ( c_str_fmt_file( s_, fmt_, ##__VA_ARGS__ ) < 0 ) \
 			return EADT_ERROR_OUT_OF_MEMORY;               \
 	} while ( 0 )
 
@@ -44,7 +47,7 @@ u8 adt_make_branch( ADT_Node* node, AllocatorInfo backing, char const* name, b32
 	node->type   = type;
 	node->name   = name;
 	node->parent = parent;
-	node->nodes  = Array<ADT_Node>::init( backing );
+	node->nodes  = array_init(ADT_Node, backing );
 
 	if ( ! node->nodes )
 		return EADT_ERROR_OUT_OF_MEMORY;
@@ -57,12 +60,12 @@ u8 adt_destroy_branch( ADT_Node* node )
 	GEN_ASSERT_NOT_NULL( node );
 	if ( ( node->type == EADT_TYPE_OBJECT || node->type == EADT_TYPE_ARRAY ) && node->nodes )
 	{
-		for ( ssize i = 0; i < scast(ssize, node->nodes.num()); ++i )
+		for ( ssize i = 0; i < scast(ssize, array_num(node->nodes)); ++i )
 		{
 			adt_destroy_branch( node->nodes + i );
 		}
 
-		node->nodes.free();
+		array_free(node->nodes);
 	}
 	return 0;
 }
@@ -87,9 +90,9 @@ ADT_Node* adt_find( ADT_Node* node, char const* name, b32 deep_search )
 		return NULL;
 	}
 
-	for ( ssize i = 0; i < scast(ssize, node->nodes.num()); i++ )
+	for ( ssize i = 0; i < scast(ssize, array_num(node->nodes)); i++ )
 	{
-		if ( ! str_compare( node->nodes[ i ].name, name ) )
+		if ( ! c_str_compare( node->nodes[ i ].name, name ) )
 		{
 			return ( node->nodes + i );
 		}
@@ -97,7 +100,7 @@ ADT_Node* adt_find( ADT_Node* node, char const* name, b32 deep_search )
 
 	if ( deep_search )
 	{
-		for ( ssize i = 0; i < scast(ssize, node->nodes.num()); i++ )
+		for ( ssize i = 0; i < scast(ssize, array_num(node->nodes)); i++ )
 		{
 			ADT_Node* res = adt_find( node->nodes + i, name, deep_search );
 
@@ -116,7 +119,7 @@ internal ADT_Node* _adt_get_value( ADT_Node* node, char const* value )
 		case EADT_TYPE_MULTISTRING :
 		case EADT_TYPE_STRING :
 			{
-				if ( node->string && ! str_compare( node->string, value ) )
+				if ( node->string && ! c_str_compare( node->string, value ) )
 				{
 					return node;
 				}
@@ -135,7 +138,7 @@ internal ADT_Node* _adt_get_value( ADT_Node* node, char const* value )
 				ssize  fsize = 0;
 				u8* buf   = file_stream_buf( &tmp, &fsize );
 
-				if ( ! str_compare( ( char const* )buf, value ) )
+				if ( ! c_str_compare( ( char const* )buf, value ) )
 				{
 					file_close( &tmp );
 					return node;
@@ -153,9 +156,9 @@ internal ADT_Node* _adt_get_value( ADT_Node* node, char const* value )
 
 internal ADT_Node* _adt_get_field( ADT_Node* node, char* name, char* value )
 {
-	for ( ssize i = 0; i < scast(ssize, node->nodes.num()); i++ )
+	for ( ssize i = 0; i < scast(ssize, array_num(node->nodes)); i++ )
 	{
-		if ( ! str_compare( node->nodes[ i ].name, name ) )
+		if ( ! c_str_compare( node->nodes[ i ].name, name ) )
 		{
 			ADT_Node* child = &node->nodes[ i ];
 			if ( _adt_get_value( child, value ) )
@@ -188,22 +191,22 @@ ADT_Node* adt_query( ADT_Node* node, char const* uri )
 	}
 
 #if defined EADT_URI_DEBUG || 0
-	str_fmt_out( "uri: %s\n", uri );
+	c_str_fmt_out( "uri: %s\n", uri );
 #endif
 
 	char *    p = ( char* )uri, *b = p, *e = p;
 	ADT_Node* found_node = NULL;
 
 	b = p;
-	p = e     = ( char* )str_skip( p, '/' );
-	char* buf = str_fmt_buf( "%.*s", ( int )( e - b ), b );
+	p = e     = ( char* )c_str_skip( p, '/' );
+	char* buf = c_str_fmt_buf( "%.*s", ( int )( e - b ), b );
 
 	/* handle field value lookup */
 	if ( *b == '[' )
 	{
 		char *l_p = buf + 1, *l_b = l_p, *l_e = l_p, *l_b2 = l_p, *l_e2 = l_p;
-		l_e  = ( char* )str_skip( l_p, '=' );
-		l_e2 = ( char* )str_skip( l_p, ']' );
+		l_e  = ( char* )c_str_skip( l_p, '=' );
+		l_e2 = ( char* )c_str_skip( l_p, ']' );
 
 		if ( ( ! *l_e && node->type != EADT_TYPE_ARRAY ) || ! *l_e2 )
 		{
@@ -228,7 +231,7 @@ ADT_Node* adt_query( ADT_Node* node, char const* uri )
 			/* run a value comparison against any child that is an object node */
 			else if ( node->type == EADT_TYPE_ARRAY )
 			{
-				for ( ssize i = 0; i < scast(ssize, node->nodes.num()); i++ )
+				for ( ssize i = 0; i < scast(ssize, array_num(node->nodes)); i++ )
 				{
 					ADT_Node* child = &node->nodes[ i ];
 					if ( child->type != EADT_TYPE_OBJECT )
@@ -246,7 +249,7 @@ ADT_Node* adt_query( ADT_Node* node, char const* uri )
 		/* [value] */
 		else
 		{
-			for ( ssize i = 0; i < scast(ssize, node->nodes.num()); i++ )
+			for ( ssize i = 0; i < scast(ssize, array_num(node->nodes)); i++ )
 			{
 				ADT_Node* child = &node->nodes[ i ];
 				if ( _adt_get_value( child, l_b2 ) )
@@ -277,8 +280,8 @@ ADT_Node* adt_query( ADT_Node* node, char const* uri )
 	/* handle array index lookup */
 	else
 	{
-		ssize idx = ( ssize )str_to_i64( buf, NULL, 10 );
-		if ( idx >= 0 && idx < scast(ssize, node->nodes.num()) )
+		ssize idx = ( ssize )c_str_to_i64( buf, NULL, 10 );
+		if ( idx >= 0 && idx < scast(ssize, array_num(node->nodes)) )
 		{
 			found_node = &node->nodes[ idx ];
 
@@ -303,15 +306,16 @@ ADT_Node* adt_alloc_at( ADT_Node* parent, ssize index )
 	if ( ! parent->nodes )
 		return NULL;
 
-	if ( index < 0 || index > scast(ssize, parent->nodes.num()) )
+	if ( index < 0 || index > scast(ssize, array_num(parent->nodes)) )
 		return NULL;
 
 	ADT_Node o = { 0 };
 	o.parent   = parent;
-	if ( ! parent->nodes.append_at( o, index ) )
+	if ( ! array_append_at( parent->nodes, o, index ) )
 		return NULL;
 
-	return parent->nodes + index;
+	ADT_Node* node = & parent->nodes[index];
+	return node;
 }
 
 ADT_Node* adt_alloc( ADT_Node* parent )
@@ -324,7 +328,7 @@ ADT_Node* adt_alloc( ADT_Node* parent )
 	if ( ! parent->nodes )
 		return NULL;
 
-	return adt_alloc_at( parent, parent->nodes.num() );
+	return adt_alloc_at( parent, array_num(parent->nodes) );
 }
 
 b8 adt_set_obj( ADT_Node* obj, char const* name, AllocatorInfo backing )
@@ -378,7 +382,7 @@ ADT_Node* adt_move_node( ADT_Node* node, ADT_Node* new_parent )
 	GEN_ASSERT_NOT_NULL( node );
 	GEN_ASSERT_NOT_NULL( new_parent );
 	GEN_ASSERT( new_parent->type == EADT_TYPE_ARRAY || new_parent->type == EADT_TYPE_OBJECT );
-	return adt_move_node_at( node, new_parent, new_parent->nodes.num() );
+	return adt_move_node_at( node, new_parent, array_num(new_parent->nodes) );
 }
 
 void adt_swap_nodes( ADT_Node* node, ADT_Node* other_node )
@@ -402,7 +406,7 @@ void adt_remove_node( ADT_Node* node )
 	GEN_ASSERT_NOT_NULL( node->parent );
 	ADT_Node* parent = node->parent;
 	ssize        index  = ( pointer_diff( parent->nodes, node ) / size_of( ADT_Node ) );
-	parent->nodes.remove_at( index );
+	array_remove_at( parent->nodes, index );
 }
 
 ADT_Node* adt_append_obj( ADT_Node* parent, char const* name )
@@ -410,7 +414,7 @@ ADT_Node* adt_append_obj( ADT_Node* parent, char const* name )
 	ADT_Node* o = adt_alloc( parent );
 	if ( ! o )
 		return NULL;
-	if ( adt_set_obj( o, name, parent->nodes.get_header()->Allocator ) )
+	if ( adt_set_obj( o, name, array_get_header(parent->nodes)->Allocator ) )
 	{
 		adt_remove_node( o );
 		return NULL;
@@ -423,7 +427,9 @@ ADT_Node* adt_append_arr( ADT_Node* parent, char const* name )
 	ADT_Node* o = adt_alloc( parent );
 	if ( ! o )
 		return NULL;
-	if ( adt_set_arr( o, name, parent->nodes.get_header()->Allocator ) )
+
+	ArrayHeader* node_header = array_get_header(parent->nodes);
+	if ( adt_set_arr( o, name, node_header->Allocator ) )
 	{
 		adt_remove_node( o );
 		return NULL;
@@ -468,7 +474,7 @@ char* adt_parse_number_strict( ADT_Node* node, char* base_str )
 	while ( *e )
 		++e;
 
-	while ( *p && ( str_find( "eE.+-", *p ) || char_is_hex_digit( *p ) ) )
+	while ( *p && ( char_first_occurence( "eE.+-", *p ) || char_is_hex_digit( *p ) ) )
 	{
 		++p;
 	}
@@ -497,7 +503,7 @@ char* adt_parse_number( ADT_Node* node, char* base_str )
 	u8        node_props = 0;
 
 	/* skip false positives and special cases */
-	if ( ! ! str_find( "eE", *p ) || ( ! ! str_find( ".+-", *p ) && ! char_is_hex_digit( *( p + 1 ) ) && *( p + 1 ) != '.' ) )
+	if ( ! ! char_first_occurence( "eE", *p ) || ( ! ! char_first_occurence( ".+-", *p ) && ! char_is_hex_digit( *( p + 1 ) ) && *( p + 1 ) != '.' ) )
 	{
 		return ++base_str;
 	}
@@ -528,7 +534,7 @@ char* adt_parse_number( ADT_Node* node, char* base_str )
 	}
 	else
 	{
-		if ( ! str_compare( e, "0x", 2 ) || ! str_compare( e, "0X", 2 ) )
+		if ( ! c_str_compare_len( e, "0x", 2 ) || ! c_str_compare_len( e, "0X", 2 ) )
 		{
 			node_props = EADT_PROPS_IS_HEX;
 		}
@@ -573,7 +579,7 @@ char* adt_parse_number( ADT_Node* node, char* base_str )
 	char expbuf[ 6 ] = { 0 };
 	ssize   expi        = 0;
 
-	if ( *e && ! ! str_find( "eE", *e ) )
+	if ( *e && ! ! char_first_occurence( "eE", *e ) )
 	{
 		++e;
 		if ( *e == '+' || *e == '-' || char_is_digit( *e ) )
@@ -592,12 +598,12 @@ char* adt_parse_number( ADT_Node* node, char* base_str )
 			}
 		}
 
-		orig_exp = exp = ( u8 )str_to_i64( expbuf, NULL, 10 );
+		orig_exp = exp = ( u8 )c_str_to_i64( expbuf, NULL, 10 );
 	}
 
 	if ( node_type == EADT_TYPE_INTEGER )
 	{
-		node->integer = str_to_i64( buf, 0, 0 );
+		node->integer = c_str_to_i64( buf, 0, 0 );
 #ifndef GEN_PARSER_DISABLE_ANALYSIS
 		/* special case: negative zero */
 		if ( node->integer == 0 && buf[ 0 ] == '-' )
@@ -612,19 +618,19 @@ char* adt_parse_number( ADT_Node* node, char* base_str )
 	}
 	else
 	{
-		node->real = str_to_f64( buf, 0 );
+		node->real = c_str_to_f64( buf, 0 );
 
 #ifndef GEN_PARSER_DISABLE_ANALYSIS
 		char *q = buf, *base_string = q, *base_string2 = q;
-		base_string           = ccast( char*, str_skip( base_string, '.' ));
+		base_string           = ccast( char*, c_str_skip( base_string, '.' ));
 		*base_string          = '\0';
 		base_string2          = base_string + 1;
-		char* base_string_off = base_string2;
-		while ( *base_string_off++ == '0' )
+		char* base_strbuilder_off = base_string2;
+		while ( *base_strbuilder_off++ == '0' )
 			base2_offset++;
 
-		base  = ( s32 )str_to_i64( q, 0, 0 );
-		base2 = ( s32 )str_to_i64( base_string2, 0, 0 );
+		base  = ( s32 )c_str_to_i64( q, 0, 0 );
+		base2 = ( s32 )c_str_to_i64( base_string2, 0, 0 );
 		if ( exp )
 		{
 			exp        = exp * ( ! ( eb == 10.0f ) ? -1 : 1 );
@@ -767,9 +773,9 @@ ADT_Error adt_print_string( FileInfo* file, ADT_Node* node, char const* escaped_
 
 	do
 	{
-		p = str_skip_any( p, escaped_chars );
+		p = c_str_skip_any( p, escaped_chars );
 		_adt_fprintf( file, "%.*s", pointer_diff( b, p ), b );
-		if ( *p && ! ! str_find( escaped_chars, *p ) )
+		if ( *p && ! ! char_first_occurence( escaped_chars, *p ) )
 		{
 			_adt_fprintf( file, "%s%c", escape_symbol, *p );
 			p++;
@@ -780,7 +786,7 @@ ADT_Error adt_print_string( FileInfo* file, ADT_Node* node, char const* escaped_
 	return EADT_ERROR_NONE;
 }
 
-ADT_Error adt_str_to_number( ADT_Node* node )
+ADT_Error adt_c_str_to_number( ADT_Node* node )
 {
 	GEN_ASSERT( node );
 
@@ -796,7 +802,7 @@ ADT_Error adt_str_to_number( ADT_Node* node )
 	return EADT_ERROR_NONE;
 }
 
-ADT_Error adt_str_to_number_strict( ADT_Node* node )
+ADT_Error adt_c_str_to_number_strict( ADT_Node* node )
 {
 	GEN_ASSERT( node );
 
@@ -843,7 +849,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
 	do
 	{
 		char delimiter = 0;
-		currentChar = ccast( char*, str_trim( currentChar, false ));
+		currentChar = ccast( char*, c_str_trim( currentChar, false ));
 
 		if ( *currentChar == 0 )
 			break;
@@ -867,7 +873,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
 		#endif
 			do
 			{
-				endChar = ccast( char*, str_skip( endChar, '"' ));
+				endChar = ccast( char*, c_str_skip( endChar, '"' ));
 
 				if ( *endChar && *( endChar + 1 ) == '"' )
 				{
@@ -886,7 +892,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
 			}
 
 			*endChar    = 0;
-			currentChar = ccast( char*, str_trim( endChar + 1, true ));
+			currentChar = ccast( char*, c_str_trim( endChar + 1, true ));
 			delimiter   = * currentChar;
 
 			/* unescape escaped quotes (so that unescaped text escapes :) */
@@ -896,7 +902,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
 				{
 					if ( *escapedChar == '"' && *( escapedChar + 1 ) == '"' )
 					{
-						mem_move( escapedChar, escapedChar + 1, str_len( escapedChar ) );
+						mem_move( escapedChar, escapedChar + 1, c_str_len( escapedChar ) );
 					}
 					escapedChar++;
 				}
@@ -923,7 +929,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
 
 			if ( * endChar )
 			{
-				currentChar = ccast( char*, str_trim( endChar, true ));
+				currentChar = ccast( char*, c_str_trim( endChar, true ));
 
 				while ( char_is_space( *( endChar - 1 ) ) )
 				{
@@ -944,7 +950,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
 			char* num_p       = beginChar;
 
 			// We only consider hexadecimal values if they start with 0x
-			if ( str_len(num_p) > 2 && num_p[0] == '0' && (num_p[1] == 'x' || num_p[1] == 'X') )
+			if ( c_str_len(num_p) > 2 && num_p[0] == '0' && (num_p[1] == 'x' || num_p[1] == 'X') )
 			{
 				num_p += 2; // skip '0x' prefix
 				do
@@ -963,16 +969,16 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
 
 			if (!skip_number)
 			{
-				adt_str_to_number(&rowItem);
+				adt_c_str_to_number(&rowItem);
 			}
 		}
 
-		if ( columnIndex >= scast(ssize, root->nodes.num()) )
+		if ( columnIndex >= scast(ssize, array_num(root->nodes)) )
 		{
 			adt_append_arr( root, NULL );
 		}
 
-		root->nodes[ columnIndex ].nodes.append( rowItem );
+		array_append( root->nodes[ columnIndex ].nodes, rowItem );
 
 		if ( delimiter == delim )
 		{
@@ -1000,7 +1006,7 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
 	}
 	while ( *currentChar );
 
-	if ( root->nodes.num() == 0 )
+	if (array_num( root->nodes) == 0 )
 	{
 		GEN_CSV_ASSERT( "unexpected end of input. stream is empty." );
 		error = ECSV_Error__UNEXPECTED_END_OF_INPUT;
@@ -1010,12 +1016,12 @@ u8 csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator, b
 	/* consider first row as a header. */
 	if ( has_header )
 	{
-		for ( ssize i = 0; i < scast(ssize, root->nodes.num()); i++ )
+		for ( ssize i = 0; i < scast(ssize, array_num(root->nodes)); i++ )
 		{
 			CSV_Object* col = root->nodes + i;
 			CSV_Object* hdr = col->nodes;
 			col->name       = hdr->string;
-			col->nodes.remove_at( 0 );
+			array_remove_at(col->nodes, 0 );
 		}
 	}
 
@@ -1038,16 +1044,16 @@ void _csv_write_record( FileInfo* file, CSV_Object* node )
 				{
 					case EADT_NAME_STYLE_DOUBLE_QUOTE :
 						{
-							str_fmt_file( file, "\"" );
+							c_str_fmt_file( file, "\"" );
 							adt_print_string( file, node, "\"", "\"" );
-							str_fmt_file( file, "\"" );
+							c_str_fmt_file( file, "\"" );
 						}
 						break;
 
 					case EADT_NAME_STYLE_NO_QUOTES :
 						{
 #endif
-							str_fmt_file( file, "%s", node->string );
+							c_str_fmt_file( file, "%s", node->string );
 #ifndef GEN_PARSER_DISABLE_ANALYSIS
 						}
 						break;
@@ -1078,11 +1084,11 @@ void csv_write_delimiter( FileInfo* file, CSV_Object* obj, char delimiter )
 	GEN_ASSERT_NOT_NULL( file );
 	GEN_ASSERT_NOT_NULL( obj );
 	GEN_ASSERT( obj->nodes );
-	ssize cols = obj->nodes.num();
+	ssize cols = array_num(obj->nodes);
 	if ( cols == 0 )
 		return;
 
-	ssize rows = obj->nodes[ 0 ].nodes.num();
+	ssize rows = array_num(obj->nodes[ 0 ].nodes);
 	if ( rows == 0 )
 		return;
 
@@ -1095,10 +1101,10 @@ void csv_write_delimiter( FileInfo* file, CSV_Object* obj, char delimiter )
 			_csv_write_header( file, &obj->nodes[ i ] );
 			if ( i + 1 != cols )
 			{
-				str_fmt_file( file, "%c", delimiter );
+				c_str_fmt_file( file, "%c", delimiter );
 			}
 		}
-		str_fmt_file( file, "\n" );
+		c_str_fmt_file( file, "\n" );
 	}
 
 	for ( ssize r = 0; r < rows; r++ )
@@ -1108,26 +1114,28 @@ void csv_write_delimiter( FileInfo* file, CSV_Object* obj, char delimiter )
 			_csv_write_record( file, &obj->nodes[ i ].nodes[ r ] );
 			if ( i + 1 != cols )
 			{
-				str_fmt_file( file, "%c", delimiter );
+				c_str_fmt_file( file, "%c", delimiter );
 			}
 		}
-		str_fmt_file( file, "\n" );
+		c_str_fmt_file( file, "\n" );
 	}
 }
 
-String csv_write_string_delimiter( AllocatorInfo a, CSV_Object* obj, char delimiter )
+StrBuilder csv_write_strbuilder_delimiter( AllocatorInfo a, CSV_Object* obj, char delimiter )
 {
 	FileInfo tmp;
 	file_stream_new( &tmp, a );
 	csv_write_delimiter( &tmp, obj, delimiter );
-	
+
 	ssize  fsize;
 	u8*    buf    = file_stream_buf( &tmp, &fsize );
-	String output = String::make_length( a, ( char* )buf, fsize );
+	StrBuilder output = strbuilder_make_length( a, ( char* )buf, fsize );
 	file_close( &tmp );
 	return output;
 }
 
+#undef _adt_fprintf
+
 #pragma endregion CSV
 
 GEN_NS_END
diff --git a/Project/Source/GasaEditor/GasaGen/gencpp/gen.scanner.hpp b/Project/Source/GasaEditor/GasaGen/gencpp/gen.scanner.hpp
index e3ec4c6..965bf61 100644
--- a/Project/Source/GasaEditor/GasaGen/gencpp/gen.scanner.hpp
+++ b/Project/Source/GasaEditor/GasaGen/gencpp/gen.scanner.hpp
@@ -11,6 +11,9 @@
 #   pragma clang diagnostic ignored "-Wunknown-pragmas"
 #	pragma clang diagnostic ignored "-Wvarargs"
 #	pragma clang diagnostic ignored "-Wunused-function"
+#	pragma clang diagnostic ignored "-Wbraced-scalar-init"
+#   pragma clang diagnostic ignored "-W#pragma-messages"
+#	pragma clang diagnostic ignored "-Wstatic-in-inline"
 #endif
 
 #ifdef __GNUC__
@@ -106,7 +109,7 @@ struct ADT_Node
 	union
 	{
 		char const*     string;
-		Array<ADT_Node> nodes;    ///< zpl_array
+		Array(ADT_Node) nodes;    ///< zpl_array
 
 		struct
 		{
@@ -372,7 +375,7 @@ char* adt_parse_number_strict( ADT_Node* node, char* base_str );
 	* @param node
 	* @return
 	*/
-ADT_Error adt_str_to_number( ADT_Node* node );
+ADT_Error adt_c_str_to_number( ADT_Node* node );
 
 /**
 	* @brief Parses and converts an existing string node into a number.
@@ -381,7 +384,7 @@ ADT_Error adt_str_to_number( ADT_Node* node );
 	* @param node
 	* @return
 	*/
-ADT_Error adt_str_to_number_strict( ADT_Node* node );
+ADT_Error adt_c_str_to_number_strict( ADT_Node* node );
 
 /**
 	* @brief Prints a number into a file stream.
@@ -428,9 +431,9 @@ u8   csv_parse_delimiter( CSV_Object* root, char* text, AllocatorInfo allocator,
 void csv_free( CSV_Object* obj );
 
 void   csv_write( FileInfo* file, CSV_Object* obj );
-String csv_write_string( AllocatorInfo a, CSV_Object* obj );
+StrBuilder csv_write_string( AllocatorInfo a, CSV_Object* obj );
 void   csv_write_delimiter( FileInfo* file, CSV_Object* obj, char delim );
-String csv_write_string_delimiter( AllocatorInfo a, CSV_Object* obj, char delim );
+StrBuilder csv_write_strbuilder_delimiter( AllocatorInfo a, CSV_Object* obj, char delim );
 
 /* inline */
 
@@ -447,168 +450,43 @@ void csv_write( FileInfo* file, CSV_Object* obj )
 }
 
 inline
-String csv_write_string( AllocatorInfo a, CSV_Object* obj )
+StrBuilder csv_write_string( AllocatorInfo a, CSV_Object* obj )
 {
-	return csv_write_string_delimiter( a, obj, ',' );
+	return csv_write_strbuilder_delimiter( a, obj, ',' );
 }
 
 #pragma endregion CSV
 
+#pragma region Scanner
+
 // This is a simple file reader that reads the entire file into memory.
 // It has an extra option to skip the first few lines for undesired includes.
 // This is done so that includes can be kept in dependency and component files so that intellisense works.
-inline
-Code scan_file( char const* path )
-{
-	FileInfo file;
+Code scan_file( char const* path );
 
-	FileError error = file_open_mode( & file, EFileMode_READ, path );
-	if ( error != EFileError_NONE )
-	{
-		GEN_FATAL( "scan_file: Could not open: %s", path );
-	}
+CodeBody parse_file( const char* path );
 
-	ssize fsize = file_size( & file );
-	if ( fsize <= 0 )
-	{
-		GEN_FATAL("scan_file: %s is empty", path );
-	}
+// The follow is basic support for light csv parsing (use it as an example)
+// Make something robust if its more serious.
 
-	String str = String::make_reserve( GlobalAllocator, fsize );
-		file_read( & file, str, fsize );
-		str.get_header().Length = fsize;
-
-	// Skip GEN_INTELLISENSE_DIRECTIVES preprocessor blocks
-	// Its designed so that the directive should be the first thing in the file.
-	// Anything that comes before it will also be omitted.
-	{
-	#define current (*scanner)
-	#define matched    0
-	#define move_fwd() do { ++ scanner; -- left; } while (0)
-		const StrC directive_start = txt( "ifdef" );
-		const StrC directive_end   = txt( "endif" );
-		const StrC def_intellisense = txt("GEN_INTELLISENSE_DIRECTIVES" );
-
-		bool        found_directive = false;
-		char const* scanner         = str.Data;
-		s32         left            = fsize;
-		while ( left )
-		{
-			// Processing directive.
-			if ( current == '#' )
-			{
-				move_fwd();
-				while ( left && char_is_space( current ) )
-					move_fwd();
-
-				if ( ! found_directive )
-				{
-					if ( left && str_compare( scanner, directive_start.Ptr, directive_start.Len ) == matched )
-					{
-						scanner += directive_start.Len;
-						left    -= directive_start.Len;
-
-						while ( left && char_is_space( current ) )
-							move_fwd();
-
-						if ( left && str_compare( scanner, def_intellisense.Ptr, def_intellisense.Len ) == matched )
-						{
-							scanner += def_intellisense.Len;
-							left    -= def_intellisense.Len;
-
-							found_directive = true;
-						}
-					}
-
-					// Skip to end of line
-					while ( left && current != '\r' && current != '\n' )
-						move_fwd();
-					move_fwd();
-
-					if ( left && current == '\n' )
-						move_fwd();
-
-					continue;
-				}
-
-				if ( left && str_compare( scanner, directive_end.Ptr, directive_end.Len ) == matched )
-				{
-					scanner += directive_end.Len;
-					left    -= directive_end.Len;
-
-					// Skip to end of line
-					while ( left && current != '\r' && current != '\n' )
-						move_fwd();
-					move_fwd();
-
-					if ( left && current == '\n' )
-						move_fwd();
-
-					// sptr skip_size = fsize - left;
-					if ( (scanner + 2) >= ( str.Data + fsize ) )
-					{
-						mem_move( str, scanner, left );
-						str.get_header().Length = left;
-						break;
-					}
-
-					mem_move( str, scanner, left );
-					str.get_header().Length = left;
-
-					break;
-				}
-
-			}
-
-			move_fwd();
-		}
-	#undef move_fwd
-	#undef matched
-	#undef current
-	}
-
-	file_close( & file );
-	return untyped_str( str );
-}
-
-#if 0
-struct CodeFile
-{
-	using namespace Parser;
-
-	String              FilePath;
-	TokArray            Tokens;
-	Array<ParseFailure> ParseFailures;
-	Code                CodeRoot;
+typedef struct CSV_Column CSV_Column;
+struct CSV_Column {
+	CSV_Object      ADT;
+	Array(ADT_Node) Content;
 };
 
-namespace Parser
-{
-	struct ParseFailure
-	{
-		String Reason;
-		Code   Node;
-	};
-}
+typedef struct CSV_Columns2 CSV_Columns2;
+struct CSV_Columns2 {
+	CSV_Object      ADT;
+	Array(ADT_Node) Col_1;
+	Array(ADT_Node) Col_2;
+};
 
-CodeFile scan_file( char const* path )
-{
-	using namespace Parser;
+CSV_Column parse_csv_one_column(AllocatorInfo allocator, char const* path);
+CSV_Columns2 parse_csv_two_columns(AllocatorInfo allocator, char const* path);
 
-	CodeFile
-	result = {};
-	result.FilePath = String::make( GlobalAllocator, path );
+#pragma endregion Scanner
 
-	Code code = scan_file( path );
-	result.CodeRoot = code;
-
-	ParseContext context = parser_get_last_context();
-	result.Tokens        = context.Tokens;
-	result.ParseFailures = context.Failures;
-
-	return result;
-}
-#endif
 GEN_NS_END
 
 #ifdef __clang__