diff --git a/bundle.php b/bundle.php
index a88f3a9..00cc515 100755
--- a/bundle.php
+++ b/bundle.php
@@ -1,6 +1,10 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * Very simple script, recursively parses a PHP file replacing all includes with the file, no deduplication
+ */
+
 function line(string $text): void
 {
     echo $text . PHP_EOL;
@@ -57,7 +61,7 @@ $lines = replaceIncludes($fromFile);
 $toFileHandle = fopen($toFile, 'w');
 foreach ($lines as $line) {
     fwrite($toFileHandle, $line);
-    chmod($toFile, 0755);
+    chmod($toFile, fileperms($fromFile));
 }
 fwrite($toFileHandle, PHP_EOL);
 fclose($toFileHandle);
\ No newline at end of file
diff --git a/includes/fileReader.php b/includes/fileReader.php
new file mode 100644
index 0000000..ac1c351
--- /dev/null
+++ b/includes/fileReader.php
@@ -0,0 +1,10 @@
+<?php
+
+function getAllLines(string $file): iterable
+{
+    $handle = fopen($file, 'r');
+    while (!feof($handle)) {
+        yield fgets($handle);
+    }
+    fclose($handle);
+}
diff --git a/includes/includeBuilder.php b/includes/includeBuilder.php
new file mode 100644
index 0000000..c3e4106
--- /dev/null
+++ b/includes/includeBuilder.php
@@ -0,0 +1,18 @@
+<?php
+
+function yieldIncludes(string $file, &$includes, int $depth = 0): iterable
+{
+    if (!isset($includes[$file])) return;
+
+    foreach (getAllLines($file) as $line) {
+        $includeFile = getLineIncludeFile($line);
+        if ($includeFile) {
+            yield from yieldIncludes($includeFile, $includes, $depth + 1);
+            unset($includes[$includeFile]);
+        } else {
+            if ($depth > 0 && str_starts_with($line, '<?php')) continue;
+            if (empty(trim($line))) continue;
+            yield $line;
+        }
+    }
+}
diff --git a/includes/includeParser.php b/includes/includeParser.php
new file mode 100644
index 0000000..8780256
--- /dev/null
+++ b/includes/includeParser.php
@@ -0,0 +1,21 @@
+<?php
+
+function getLineIncludeFile(string $line): false|string
+{
+    preg_match("/include\s+'([^']+\.php)'/", $line, $matches);
+    if (count($matches) === 2) {
+        return $matches[1];
+    }
+    return false;
+}
+
+function buildIncludes(string $file, array &$includes): void
+{
+    foreach (getAllLines($file) as $line) {
+        $includeFile = getLineIncludeFile($line);
+        if ($includeFile) {
+            buildIncludes($includeFile, $includes);
+        }
+    }
+    $includes[$file] = true;
+}
diff --git a/includes/io.php b/includes/io.php
new file mode 100644
index 0000000..da760e0
--- /dev/null
+++ b/includes/io.php
@@ -0,0 +1,6 @@
+<?php
+
+function line(string $text): void
+{
+    echo $text . PHP_EOL;
+}
\ No newline at end of file
diff --git a/packer.php b/packer.php
new file mode 100755
index 0000000..d3e7ce0
--- /dev/null
+++ b/packer.php
@@ -0,0 +1,33 @@
+#!/usr/bin/env php
+<?php
+
+include 'includes/fileReader.php';
+include 'includes/io.php';
+include 'includes/includeBuilder.php';
+include 'includes/includeParser.php';
+
+if (count($argv) < 3) {
+    line('Usage: ' . __FILE__ . ' <inFile> <outFile>');
+    exit(1);
+}
+$fromFile = $argv[1];
+if (!file_exists($fromFile)) {
+    line('File not found: ' . $fromFile);
+    exit(1);
+}
+$toFile = $argv[2];
+if (file_exists($toFile)) {
+    line('File already exists: ' . $toFile);
+    unlink($toFile);
+}
+
+$includes = [];
+buildIncludes($fromFile, $includes);
+$lines = yieldIncludes($fromFile, $includes);
+
+$toFileHandle = fopen($toFile, 'w');
+foreach ($lines as $line) {
+    fwrite($toFileHandle, $line);
+    chmod($toFile, fileperms($fromFile));
+}
+fclose($toFileHandle);
diff --git a/test.php b/test.php
deleted file mode 100755
index 01adc3c..0000000
--- a/test.php
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-include 'test.include.php';
-
-echo 'test' . PHP_EOL;
diff --git a/test.include.php b/test/test.include.php
similarity index 53%
rename from test.include.php
rename to test/test.include.php
index f9c482a..18fa7eb 100644
--- a/test.include.php
+++ b/test/test.include.php
@@ -1,5 +1,5 @@
 <?php
 
-include 'test2.include.php';
+include 'test.include2.php';
 
 echo 'test.include' . PHP_EOL;
diff --git a/test/test.include2.php b/test/test.include2.php
new file mode 100644
index 0000000..02eccf2
--- /dev/null
+++ b/test/test.include2.php
@@ -0,0 +1,3 @@
+<?php
+
+echo 'test.include2' . PHP_EOL;
diff --git a/test/test.php b/test/test.php
new file mode 100644
index 0000000..04fe74a
--- /dev/null
+++ b/test/test.php
@@ -0,0 +1,11 @@
+#!/usr/bin/env php
+<?php
+
+include 'test.include.php';
+include 'test2.include.php';
+include 'test2.include.php';
+include 'test.include.php';
+include 'test2.include.php';
+include 'test2.include.php';
+
+echo 'test' . PHP_EOL;
diff --git a/test2.include.php b/test2.include.php
deleted file mode 100644
index 8ed5ea5..0000000
--- a/test2.include.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-echo 'test2.include' . PHP_EOL;