diff --git a/tests/createNAND.py b/tests/createNAND.py
index f84aca8..3f07e96 100644
--- a/tests/createNAND.py
+++ b/tests/createNAND.py
@@ -1,19 +1,24 @@
 #!/usr/bin/python
 
-import os, Wii
+import os, sys, Wii
 
-nand = Wii.NAND('/home/megazig/Wii.py/nand')
+def main():
+	if len(sys.argv) == 1:
+		print 'Usage: python createNAND.py <foldername>'
+		sys.exit(1)
 
-# change for region
-sysV = 417
-iosV = 6174
+	nand = Wii.NAND(sys.argv[1])
 
-#Wii.NUS.download(0x0000000100000002, sysV).dumpDir("0000000100000002")
-#Wii.NUS.download(0x000000010000003C, iosV).dumpDir("000000010000003C")
-#Wii.NUS.download(0x0001000848414C45).dumpDir("0001000848414C45")
-#Wii.NUS.download(0x0001000848414B45).dumpDir("0001000848414B45")
+	# change for region
+	sysV = 417
+	iosV = 6174
+
+	nand.importTitle(Wii.NUS.download(0x0000000100000002, sysV), False)
+	nand.importTitle(Wii.NUS.download(0x000000010000003C, iosV), False)
+	nand.importTitle(Wii.NUS.download(0x0001000848414C45), False)
+	nand.importTitle(Wii.NUS.download(0x0001000848414B45), False)
+	sys.exit(0)
+
+if __name__ == "__main__":
+	main()
 
-nand.importTitle(Wii.NUS.download(0x0000000100000002, sysV), False)
-nand.importTitle(Wii.NUS.download(0x000000010000003C, iosV), False)
-nand.importTitle(Wii.NUS.download(0x0001000848414C45), False)
-nand.importTitle(Wii.NUS.download(0x0001000848414B45), False)
diff --git a/tests/downloadTitle.py b/tests/downloadTitle.py
new file mode 100644
index 0000000..32d763a
--- /dev/null
+++ b/tests/downloadTitle.py
@@ -0,0 +1,21 @@
+#!/usr/bin/python
+
+import os, sys, Wii
+
+def main():
+	if len(sys.argv) == 1:
+		print 'Usage: python downloadTitle.py <titleid> <version>'
+		sys.exit(1)
+
+	titleid = sys.argv[1]
+	titlehex = int(titleid, 16)
+	version = sys.argv[2]
+
+	Wii.NUS.download(titlehex, int(version)).dumpDir(titleid + '.' + version)
+
+	sys.exit(0)
+
+if __name__ == "__main__":
+	main()
+
+