diff --git a/src/llvm_backend_stmt.cpp b/src/llvm_backend_stmt.cpp
index 9a5f25712..d6e8d1bfd 100644
--- a/src/llvm_backend_stmt.cpp
+++ b/src/llvm_backend_stmt.cpp
@@ -2571,6 +2571,80 @@ gb_internal void lb_build_stmt(lbProcedure *p, Ast *node) {
 	case_end;
 
 	case_ast_node(us, UsingStmt, node);
+	{
+		// NOTE(Ed) - Sectr Fork: Added this in for debubability.
+		// Will add a local ptr variable referencing every exposed field into the stack frame
+
+		// Don't add for debug builds
+		if (p->debug_info == nullptr) {
+			return;
+		}
+
+		for ( Ast* ast_field :  us->list )
+		{
+			if (is_blank_ident(ast_field)) {
+				continue;
+			}
+
+			GB_ASSERT(ast_field->kind == Ast_Ident);
+			Entity*  entity_field = entity_of_node(ast_field);
+			TokenPos pos          = ast_token(ast_field).pos;
+
+			GB_ASSERT_MSG(entity_field != nullptr, "\n% missing child entity %.*s for using statement"
+				, token_pos_to_string(pos), LIT(ast_field->Ident.token.string)
+			);
+		}
+
+		TEMPORARY_ALLOCATOR_GUARD();
+
+		for ( Ast* ast_var :  us->list )
+		{
+			if (is_blank_ident(ast_var)) {
+				continue;
+			}
+
+			Entity* ent_var = entity_of_node(ast_var);
+			if (ent_var->kind != Entity_Variable ) {
+				continue;
+			}
+			Type* type = base_type(type_deref(ent_var->type));
+			if (type == nullptr) {
+				continue;
+			}
+
+			// Get base variable address
+			// lbValue var_ptr = lb_build_addr_ptr(p, ast_var);
+
+			Type* struct_type = base_type(type_deref(ent_var->type));
+			if (struct_type == nullptr || struct_type->kind != Type_Struct) {
+				continue;
+			}
+
+			// Get base struct pointer
+			lbValue struct_ptr = lb_build_addr_ptr(p, ast_var);
+
+			wait_signal_until_available(& struct_type->Struct.fields_wait_signal);
+			for_array(id, struct_type->Struct.fields)
+			{
+				Entity *field = struct_type->Struct.fields [ id ];
+				if (field->kind != Entity_Variable || ! (field->flags & EntityFlag_Field)) {
+					continue;
+				}
+
+				Selection sel = lookup_field_from_index(struct_type, field->Variable.field_index);
+				if (sel.entity == nullptr) {
+					continue;
+				}
+
+				Type* type_ptr_field_type = alloc_type_pointer(field->type);
+
+				// Create debug variable for field access
+				lbAddr  field_debug_ptr = lb_add_local          (p, type_ptr_field_type, field, false);
+				lbValue field_ptr       = lb_emit_deep_field_gep(p, struct_ptr, sel);
+				lb_addr_store(p, field_debug_ptr, field_ptr);
+			}
+		}
+	}
 	case_end;
 
 	case_ast_node(ws, WhenStmt, node);
diff --git a/src/parser.cpp b/src/parser.cpp
index 35f76abca..2be9c172a 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -5670,6 +5670,7 @@ gb_internal void parser_add_foreign_file_to_process(Parser *p, AstPackage *pkg,
 	thread_pool_add_task(foreign_file_worker_proc, wd);
 }
 
+// NOTE(Ed) - Sectr Fork: Added this in for monolothic package support
 gb_internal ReadDirectoryError read_directory_recursive(String path, Array<FileInfo> *fi, String const &FILE_EXT, bool is_monolihtic = false) {
 	Array<FileInfo> sub_list = {};
 	ReadDirectoryError rd_err = read_directory(path, &sub_list);
@@ -5684,7 +5685,7 @@ gb_internal ReadDirectoryError read_directory_recursive(String path, Array<FileI
 	String ext = path_extension(sub_list[0].name);
 	bool monolithic_specified = false;
 	if (is_monolihtic || ext == FILE_EXT_MONLITHIC) {
-		// ALl subdirectories for this package cannot have nested packages, they'll all be considered part of the same package
+		// All subdirectories for this package cannot have nested packages, they will all be considered part of the same package
 		monolithic_specified = true;
 	}
 	for (FileInfo sub_fi : sub_list) {
@@ -5740,7 +5741,7 @@ gb_internal AstPackage *try_add_import_path(Parser *p, String path, String const
 		return pkg;
 	}
 
-
+	// NOTE(Ed) - Sectr Fork: Added recusive support for monolithic packages
 	Array<FileInfo> list = {};
 	ReadDirectoryError rd_err;
 	rd_err = read_directory_recursive( path, &list, FILE_EXT );