diff --git a/iso/empanadas/empanadas/scripts/.sync_from_peridot.py.swp b/iso/empanadas/empanadas/scripts/.sync_from_peridot.py.swp
deleted file mode 100644
index 48e2275..0000000
Binary files a/iso/empanadas/empanadas/scripts/.sync_from_peridot.py.swp and /dev/null differ
diff --git a/mangle/generators/.gitignore b/mangle/generators/.gitignore
new file mode 100644
index 0000000..67e33fd
--- /dev/null
+++ b/mangle/generators/.gitignore
@@ -0,0 +1,3 @@
+__pycache__/                                                                                                                                                                                                         *.py[cod]
+*$py.class
+*.so
diff --git a/mangle/generators/generate_prepopulate_from_pungi b/mangle/generators/generate_prepopulate_from_pungi
index 25b75b0..96cff93 100755
--- a/mangle/generators/generate_prepopulate_from_pungi
+++ b/mangle/generators/generate_prepopulate_from_pungi
@@ -6,7 +6,7 @@ if [ -n "$1" ] && [ -n "$2" ]; then
   MAJOR=$1
   DATE=$2
 else
-  echo "Major version not specified"
+  echo "Major version or date not specified"
   exit 1
 fi
 
@@ -16,6 +16,7 @@ grep_val=$?
 
 if [ "$grep_val" -ne 0 ]; then
   echo "Date format incorrect. You must use: YYYYMMDD.X"
+  exit 2
 fi
 
 export RLVER=$MAJOR
@@ -23,7 +24,7 @@ source common
 
 drop="${PREPOPDROP}"
 current=$(pwd)
-compose_dir="${COMPOSE_BASEDIR}/Rocky-${MAJOR}-${DATE}/compose"
+compose_dir="${COMPOSE_BASEDIR}/${MAJOR}/Rocky-${MAJOR}-${DATE}/compose"
 
 pushd "${compose_dir}" || { echo "Could not change directory"; exit 1; }
 /usr/bin/python3 "${current}/prepopulate_parser.py"
diff --git a/mangle/generators/generate_prepopulate_from_pungi_latest b/mangle/generators/generate_prepopulate_from_pungi_latest
new file mode 100755
index 0000000..5566fc2
--- /dev/null
+++ b/mangle/generators/generate_prepopulate_from_pungi_latest
@@ -0,0 +1,29 @@
+#!/bin/bash
+# Parses a local compose's repos
+#set -x
+
+if [ -n "$1" ]; then
+  MAJOR=$1
+else
+  echo "Major version not specified"
+  exit 1
+fi
+
+export RLVER=$MAJOR
+source common
+
+drop="${PREPOPDROP}"
+current=$(pwd)
+compose_dir="${COMPOSE_BASEDIR}/${MAJOR}/latest-Rocky-${MAJOR}/compose"
+
+pushd "${compose_dir}" || { echo "Could not change directory"; exit 1; }
+/usr/bin/python3 "${current}/prepopulate_parser.py" --pungi
+ret_val=$?
+popd || { echo "Could not change back..."; exit 1; }
+
+if [ "$ret_val" -ne "0" ]; then
+  echo "There was an error running through the parser."
+  exit 1
+fi
+
+echo "File located at: $drop"
diff --git a/mangle/generators/generate_prepopulate_from_stream b/mangle/generators/generate_prepopulate_from_stream
index a4f5ede..3d51a5c 100755
--- a/mangle/generators/generate_prepopulate_from_stream
+++ b/mangle/generators/generate_prepopulate_from_stream
@@ -6,7 +6,7 @@ if [ -n "$1" ] && [ -n "$2" ]; then
   MAJOR=$1
   DATE=$2
 else
-  echo "Major version not specified"
+  echo "Major version or date not specified"
   exit 1
 fi
 
@@ -16,6 +16,7 @@ grep_val=$?
 
 if [ "$grep_val" -ne 0 ]; then
   echo "Date format incorrect. You must use: YYYYMMDD.X"
+  exit 2
 fi
 
 export RLVER=$MAJOR
diff --git a/mangle/generators/prepopulate_parser.py b/mangle/generators/prepopulate_parser.py
index 43f9787..bf21ea1 100755
--- a/mangle/generators/prepopulate_parser.py
+++ b/mangle/generators/prepopulate_parser.py
@@ -2,6 +2,7 @@
 import os
 import os.path
 import json
+import argparse
 import dnf
 import createrepo_c as cr
 from common import *
@@ -20,6 +21,15 @@ IGNORES = [
         'redhat-release'
 ]
 
+parser = argparse.ArgumentParser()
+parser.add_argument("--pungi", help="local pungi is here", action='store_true')
+args = parser.parse_args()
+
+if args.pungi:
+    APPEND_TO_PATH = '/os'
+else:
+    APPEND_TO_PATH = ''
+
 def warningcb(warning_type, message):
     print("WARNING: %s" % message)
     return True
@@ -31,7 +41,7 @@ for k in REPOS:
         PRIMARY_XML_PATH   = None
         FILELISTS_XML_PATH = None
         OTHER_XML_PATH     = None
-        REPO_PATH          = k + '/' + arch
+        REPO_PATH          = k + '/' + arch + APPEND_TO_PATH
         repomd = cr.Repomd()
         cr.xml_parse_repomd(os.path.join(REPO_PATH, "repodata/repomd.xml"), repomd, warningcb)
         for record in repomd.records: