diff --git a/ReportToolz/bp2json.php b/ReportToolz/bp2json.php
old mode 100644
new mode 100755

diff --git a/ReportToolz/bp2json.php b/ReportToolz/bp2json.php
old mode 100644
new mode 100755
diff --git a/ReportToolz/config.php b/ReportToolz/config.php
index 6c6d233..380f5eb 100644
--- a/ReportToolz/config.php
+++ b/ReportToolz/config.php
@@ -5,6 +5,8 @@
 $vdbPath = "/opt/RossMarks/DirtyScripts/ReportToolz/";
 
 // repgen templates
-$template = "templates/odt/blank_template_v1.2.odt";
+//$template = "/mnt/hgfs/PentestOS/Misc/repgen_test/test_04/blank_template_v2.0.odt";
+$template = "templates/odt/blank_template_v2.0.odt";
+//$CHECKtemplate = "templates/odt/blank_template_check_v0.4.odt";
 $vulnTemplate = "templates/odt/vuln_template_v0.2.xml";
-?>
\ No newline at end of file
+?>

diff --git a/ReportToolz/bp2json.php b/ReportToolz/bp2json.php
old mode 100644
new mode 100755
diff --git a/ReportToolz/config.php b/ReportToolz/config.php
index 6c6d233..380f5eb 100644
--- a/ReportToolz/config.php
+++ b/ReportToolz/config.php
@@ -5,6 +5,8 @@
 $vdbPath = "/opt/RossMarks/DirtyScripts/ReportToolz/";
 
 // repgen templates
-$template = "templates/odt/blank_template_v1.2.odt";
+//$template = "/mnt/hgfs/PentestOS/Misc/repgen_test/test_04/blank_template_v2.0.odt";
+$template = "templates/odt/blank_template_v2.0.odt";
+//$CHECKtemplate = "templates/odt/blank_template_check_v0.4.odt";
 $vulnTemplate = "templates/odt/vuln_template_v0.2.xml";
-?>
\ No newline at end of file
+?>
diff --git a/ReportToolz/rep2.php b/ReportToolz/rep2.php
index e57943a..82c5c42 100755
--- a/ReportToolz/rep2.php
+++ b/ReportToolz/rep2.php
@@ -112,8 +112,9 @@
 $switch = 0;
 $sub2 = 0;
 $sub3 = 1;
+echo "[=] Template $templateVer used\n"; 
 if(number_format($templateVer, 2) >= number_format(1.0, 2)){
-	echo "[=] Template $templateVer used\n";
+	
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -239,6 +240,7 @@
 
 	$vuln[0]['desc'] = $first_desc[sizeof($first_desc)-1];
 }else{ // old template or Dave's format
+	echo "[!] Daves Template\n";
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -393,9 +395,7 @@
 				$vuln[$i]['fix'] = $jsonIssue['summary_solution'];
 			}
 		}
-	}
-
-	
+	}	
 }
 
 //print_r($vuln); // DEBUG

diff --git a/ReportToolz/bp2json.php b/ReportToolz/bp2json.php
old mode 100644
new mode 100755
diff --git a/ReportToolz/config.php b/ReportToolz/config.php
index 6c6d233..380f5eb 100644
--- a/ReportToolz/config.php
+++ b/ReportToolz/config.php
@@ -5,6 +5,8 @@
 $vdbPath = "/opt/RossMarks/DirtyScripts/ReportToolz/";
 
 // repgen templates
-$template = "templates/odt/blank_template_v1.2.odt";
+//$template = "/mnt/hgfs/PentestOS/Misc/repgen_test/test_04/blank_template_v2.0.odt";
+$template = "templates/odt/blank_template_v2.0.odt";
+//$CHECKtemplate = "templates/odt/blank_template_check_v0.4.odt";
 $vulnTemplate = "templates/odt/vuln_template_v0.2.xml";
-?>
\ No newline at end of file
+?>
diff --git a/ReportToolz/rep2.php b/ReportToolz/rep2.php
index e57943a..82c5c42 100755
--- a/ReportToolz/rep2.php
+++ b/ReportToolz/rep2.php
@@ -112,8 +112,9 @@
 $switch = 0;
 $sub2 = 0;
 $sub3 = 1;
+echo "[=] Template $templateVer used\n"; 
 if(number_format($templateVer, 2) >= number_format(1.0, 2)){
-	echo "[=] Template $templateVer used\n";
+	
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -239,6 +240,7 @@
 
 	$vuln[0]['desc'] = $first_desc[sizeof($first_desc)-1];
 }else{ // old template or Dave's format
+	echo "[!] Daves Template\n";
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -393,9 +395,7 @@
 				$vuln[$i]['fix'] = $jsonIssue['summary_solution'];
 			}
 		}
-	}
-
-	
+	}	
 }
 
 //print_r($vuln); // DEBUG
diff --git a/ReportToolz/templates/odt/blank_template_v2.0.odt b/ReportToolz/templates/odt/blank_template_v2.0.odt
new file mode 100755
index 0000000..6bbd215
--- /dev/null
+++ b/ReportToolz/templates/odt/blank_template_v2.0.odt
Binary files differ

diff --git a/ReportToolz/bp2json.php b/ReportToolz/bp2json.php
old mode 100644
new mode 100755
diff --git a/ReportToolz/config.php b/ReportToolz/config.php
index 6c6d233..380f5eb 100644
--- a/ReportToolz/config.php
+++ b/ReportToolz/config.php
@@ -5,6 +5,8 @@
 $vdbPath = "/opt/RossMarks/DirtyScripts/ReportToolz/";
 
 // repgen templates
-$template = "templates/odt/blank_template_v1.2.odt";
+//$template = "/mnt/hgfs/PentestOS/Misc/repgen_test/test_04/blank_template_v2.0.odt";
+$template = "templates/odt/blank_template_v2.0.odt";
+//$CHECKtemplate = "templates/odt/blank_template_check_v0.4.odt";
 $vulnTemplate = "templates/odt/vuln_template_v0.2.xml";
-?>
\ No newline at end of file
+?>
diff --git a/ReportToolz/rep2.php b/ReportToolz/rep2.php
index e57943a..82c5c42 100755
--- a/ReportToolz/rep2.php
+++ b/ReportToolz/rep2.php
@@ -112,8 +112,9 @@
 $switch = 0;
 $sub2 = 0;
 $sub3 = 1;
+echo "[=] Template $templateVer used\n"; 
 if(number_format($templateVer, 2) >= number_format(1.0, 2)){
-	echo "[=] Template $templateVer used\n";
+	
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -239,6 +240,7 @@
 
 	$vuln[0]['desc'] = $first_desc[sizeof($first_desc)-1];
 }else{ // old template or Dave's format
+	echo "[!] Daves Template\n";
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -393,9 +395,7 @@
 				$vuln[$i]['fix'] = $jsonIssue['summary_solution'];
 			}
 		}
-	}
-
-	
+	}	
 }
 
 //print_r($vuln); // DEBUG
diff --git a/ReportToolz/templates/odt/blank_template_v2.0.odt b/ReportToolz/templates/odt/blank_template_v2.0.odt
new file mode 100755
index 0000000..6bbd215
--- /dev/null
+++ b/ReportToolz/templates/odt/blank_template_v2.0.odt
Binary files differ
diff --git a/ReportToolz/update.php b/ReportToolz/update.php
new file mode 100644
index 0000000..bc08312
--- /dev/null
+++ b/ReportToolz/update.php
@@ -0,0 +1,17 @@
+<?php
+
+/***
+ * - check connection
+ * - check API key
+ * - create folder if not exist
+ * - get md5 of folder
+ * - get md5 of remote
+ * - if different download and extract new
+ * - git pull scripts
+ ***/
+
+
+
+
+
+?>
\ No newline at end of file

diff --git a/ReportToolz/bp2json.php b/ReportToolz/bp2json.php
old mode 100644
new mode 100755
diff --git a/ReportToolz/config.php b/ReportToolz/config.php
index 6c6d233..380f5eb 100644
--- a/ReportToolz/config.php
+++ b/ReportToolz/config.php
@@ -5,6 +5,8 @@
 $vdbPath = "/opt/RossMarks/DirtyScripts/ReportToolz/";
 
 // repgen templates
-$template = "templates/odt/blank_template_v1.2.odt";
+//$template = "/mnt/hgfs/PentestOS/Misc/repgen_test/test_04/blank_template_v2.0.odt";
+$template = "templates/odt/blank_template_v2.0.odt";
+//$CHECKtemplate = "templates/odt/blank_template_check_v0.4.odt";
 $vulnTemplate = "templates/odt/vuln_template_v0.2.xml";
-?>
\ No newline at end of file
+?>
diff --git a/ReportToolz/rep2.php b/ReportToolz/rep2.php
index e57943a..82c5c42 100755
--- a/ReportToolz/rep2.php
+++ b/ReportToolz/rep2.php
@@ -112,8 +112,9 @@
 $switch = 0;
 $sub2 = 0;
 $sub3 = 1;
+echo "[=] Template $templateVer used\n"; 
 if(number_format($templateVer, 2) >= number_format(1.0, 2)){
-	echo "[=] Template $templateVer used\n";
+	
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -239,6 +240,7 @@
 
 	$vuln[0]['desc'] = $first_desc[sizeof($first_desc)-1];
 }else{ // old template or Dave's format
+	echo "[!] Daves Template\n";
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -393,9 +395,7 @@
 				$vuln[$i]['fix'] = $jsonIssue['summary_solution'];
 			}
 		}
-	}
-
-	
+	}	
 }
 
 //print_r($vuln); // DEBUG
diff --git a/ReportToolz/templates/odt/blank_template_v2.0.odt b/ReportToolz/templates/odt/blank_template_v2.0.odt
new file mode 100755
index 0000000..6bbd215
--- /dev/null
+++ b/ReportToolz/templates/odt/blank_template_v2.0.odt
Binary files differ
diff --git a/ReportToolz/update.php b/ReportToolz/update.php
new file mode 100644
index 0000000..bc08312
--- /dev/null
+++ b/ReportToolz/update.php
@@ -0,0 +1,17 @@
+<?php
+
+/***
+ * - check connection
+ * - check API key
+ * - create folder if not exist
+ * - get md5 of folder
+ * - get md5 of remote
+ * - if different download and extract new
+ * - git pull scripts
+ ***/
+
+
+
+
+
+?>
\ No newline at end of file
diff --git "a/eicar/\074img src=x onError=alert\0501\051\076.jpg" "b/eicar/\074img src=x onError=alert\0501\051\076.jpg"
new file mode 100644
index 0000000..9daeafb
--- /dev/null
+++ "b/eicar/\074img src=x onError=alert\0501\051\076.jpg"
@@ -0,0 +1 @@
+test

diff --git a/ReportToolz/bp2json.php b/ReportToolz/bp2json.php
old mode 100644
new mode 100755
diff --git a/ReportToolz/config.php b/ReportToolz/config.php
index 6c6d233..380f5eb 100644
--- a/ReportToolz/config.php
+++ b/ReportToolz/config.php
@@ -5,6 +5,8 @@
 $vdbPath = "/opt/RossMarks/DirtyScripts/ReportToolz/";
 
 // repgen templates
-$template = "templates/odt/blank_template_v1.2.odt";
+//$template = "/mnt/hgfs/PentestOS/Misc/repgen_test/test_04/blank_template_v2.0.odt";
+$template = "templates/odt/blank_template_v2.0.odt";
+//$CHECKtemplate = "templates/odt/blank_template_check_v0.4.odt";
 $vulnTemplate = "templates/odt/vuln_template_v0.2.xml";
-?>
\ No newline at end of file
+?>
diff --git a/ReportToolz/rep2.php b/ReportToolz/rep2.php
index e57943a..82c5c42 100755
--- a/ReportToolz/rep2.php
+++ b/ReportToolz/rep2.php
@@ -112,8 +112,9 @@
 $switch = 0;
 $sub2 = 0;
 $sub3 = 1;
+echo "[=] Template $templateVer used\n"; 
 if(number_format($templateVer, 2) >= number_format(1.0, 2)){
-	echo "[=] Template $templateVer used\n";
+	
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -239,6 +240,7 @@
 
 	$vuln[0]['desc'] = $first_desc[sizeof($first_desc)-1];
 }else{ // old template or Dave's format
+	echo "[!] Daves Template\n";
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -393,9 +395,7 @@
 				$vuln[$i]['fix'] = $jsonIssue['summary_solution'];
 			}
 		}
-	}
-
-	
+	}	
 }
 
 //print_r($vuln); // DEBUG
diff --git a/ReportToolz/templates/odt/blank_template_v2.0.odt b/ReportToolz/templates/odt/blank_template_v2.0.odt
new file mode 100755
index 0000000..6bbd215
--- /dev/null
+++ b/ReportToolz/templates/odt/blank_template_v2.0.odt
Binary files differ
diff --git a/ReportToolz/update.php b/ReportToolz/update.php
new file mode 100644
index 0000000..bc08312
--- /dev/null
+++ b/ReportToolz/update.php
@@ -0,0 +1,17 @@
+<?php
+
+/***
+ * - check connection
+ * - check API key
+ * - create folder if not exist
+ * - get md5 of folder
+ * - get md5 of remote
+ * - if different download and extract new
+ * - git pull scripts
+ ***/
+
+
+
+
+
+?>
\ No newline at end of file
diff --git "a/eicar/\074img src=x onError=alert\0501\051\076.jpg" "b/eicar/\074img src=x onError=alert\0501\051\076.jpg"
new file mode 100644
index 0000000..9daeafb
--- /dev/null
+++ "b/eicar/\074img src=x onError=alert\0501\051\076.jpg"
@@ -0,0 +1 @@
+test
diff --git a/eicar/eicar.jpg b/eicar/eicar.jpg
new file mode 100644
index 0000000..704cac8
--- /dev/null
+++ b/eicar/eicar.jpg
@@ -0,0 +1 @@
+X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*

diff --git a/ReportToolz/bp2json.php b/ReportToolz/bp2json.php
old mode 100644
new mode 100755
diff --git a/ReportToolz/config.php b/ReportToolz/config.php
index 6c6d233..380f5eb 100644
--- a/ReportToolz/config.php
+++ b/ReportToolz/config.php
@@ -5,6 +5,8 @@
 $vdbPath = "/opt/RossMarks/DirtyScripts/ReportToolz/";
 
 // repgen templates
-$template = "templates/odt/blank_template_v1.2.odt";
+//$template = "/mnt/hgfs/PentestOS/Misc/repgen_test/test_04/blank_template_v2.0.odt";
+$template = "templates/odt/blank_template_v2.0.odt";
+//$CHECKtemplate = "templates/odt/blank_template_check_v0.4.odt";
 $vulnTemplate = "templates/odt/vuln_template_v0.2.xml";
-?>
\ No newline at end of file
+?>
diff --git a/ReportToolz/rep2.php b/ReportToolz/rep2.php
index e57943a..82c5c42 100755
--- a/ReportToolz/rep2.php
+++ b/ReportToolz/rep2.php
@@ -112,8 +112,9 @@
 $switch = 0;
 $sub2 = 0;
 $sub3 = 1;
+echo "[=] Template $templateVer used\n"; 
 if(number_format($templateVer, 2) >= number_format(1.0, 2)){
-	echo "[=] Template $templateVer used\n";
+	
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -239,6 +240,7 @@
 
 	$vuln[0]['desc'] = $first_desc[sizeof($first_desc)-1];
 }else{ // old template or Dave's format
+	echo "[!] Daves Template\n";
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -393,9 +395,7 @@
 				$vuln[$i]['fix'] = $jsonIssue['summary_solution'];
 			}
 		}
-	}
-
-	
+	}	
 }
 
 //print_r($vuln); // DEBUG
diff --git a/ReportToolz/templates/odt/blank_template_v2.0.odt b/ReportToolz/templates/odt/blank_template_v2.0.odt
new file mode 100755
index 0000000..6bbd215
--- /dev/null
+++ b/ReportToolz/templates/odt/blank_template_v2.0.odt
Binary files differ
diff --git a/ReportToolz/update.php b/ReportToolz/update.php
new file mode 100644
index 0000000..bc08312
--- /dev/null
+++ b/ReportToolz/update.php
@@ -0,0 +1,17 @@
+<?php
+
+/***
+ * - check connection
+ * - check API key
+ * - create folder if not exist
+ * - get md5 of folder
+ * - get md5 of remote
+ * - if different download and extract new
+ * - git pull scripts
+ ***/
+
+
+
+
+
+?>
\ No newline at end of file
diff --git "a/eicar/\074img src=x onError=alert\0501\051\076.jpg" "b/eicar/\074img src=x onError=alert\0501\051\076.jpg"
new file mode 100644
index 0000000..9daeafb
--- /dev/null
+++ "b/eicar/\074img src=x onError=alert\0501\051\076.jpg"
@@ -0,0 +1 @@
+test
diff --git a/eicar/eicar.jpg b/eicar/eicar.jpg
new file mode 100644
index 0000000..704cac8
--- /dev/null
+++ b/eicar/eicar.jpg
@@ -0,0 +1 @@
+X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*
diff --git a/eicar/eicar.pdf b/eicar/eicar.pdf
new file mode 100644
index 0000000..704cac8
--- /dev/null
+++ b/eicar/eicar.pdf
@@ -0,0 +1 @@
+X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*

diff --git a/ReportToolz/bp2json.php b/ReportToolz/bp2json.php
old mode 100644
new mode 100755
diff --git a/ReportToolz/config.php b/ReportToolz/config.php
index 6c6d233..380f5eb 100644
--- a/ReportToolz/config.php
+++ b/ReportToolz/config.php
@@ -5,6 +5,8 @@
 $vdbPath = "/opt/RossMarks/DirtyScripts/ReportToolz/";
 
 // repgen templates
-$template = "templates/odt/blank_template_v1.2.odt";
+//$template = "/mnt/hgfs/PentestOS/Misc/repgen_test/test_04/blank_template_v2.0.odt";
+$template = "templates/odt/blank_template_v2.0.odt";
+//$CHECKtemplate = "templates/odt/blank_template_check_v0.4.odt";
 $vulnTemplate = "templates/odt/vuln_template_v0.2.xml";
-?>
\ No newline at end of file
+?>
diff --git a/ReportToolz/rep2.php b/ReportToolz/rep2.php
index e57943a..82c5c42 100755
--- a/ReportToolz/rep2.php
+++ b/ReportToolz/rep2.php
@@ -112,8 +112,9 @@
 $switch = 0;
 $sub2 = 0;
 $sub3 = 1;
+echo "[=] Template $templateVer used\n"; 
 if(number_format($templateVer, 2) >= number_format(1.0, 2)){
-	echo "[=] Template $templateVer used\n";
+	
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -239,6 +240,7 @@
 
 	$vuln[0]['desc'] = $first_desc[sizeof($first_desc)-1];
 }else{ // old template or Dave's format
+	echo "[!] Daves Template\n";
 	for ($i=$start; $i <= $end ; $i++) { 
 		// change state (action to take)
 		/***
@@ -393,9 +395,7 @@
 				$vuln[$i]['fix'] = $jsonIssue['summary_solution'];
 			}
 		}
-	}
-
-	
+	}	
 }
 
 //print_r($vuln); // DEBUG
diff --git a/ReportToolz/templates/odt/blank_template_v2.0.odt b/ReportToolz/templates/odt/blank_template_v2.0.odt
new file mode 100755
index 0000000..6bbd215
--- /dev/null
+++ b/ReportToolz/templates/odt/blank_template_v2.0.odt
Binary files differ
diff --git a/ReportToolz/update.php b/ReportToolz/update.php
new file mode 100644
index 0000000..bc08312
--- /dev/null
+++ b/ReportToolz/update.php
@@ -0,0 +1,17 @@
+<?php
+
+/***
+ * - check connection
+ * - check API key
+ * - create folder if not exist
+ * - get md5 of folder
+ * - get md5 of remote
+ * - if different download and extract new
+ * - git pull scripts
+ ***/
+
+
+
+
+
+?>
\ No newline at end of file
diff --git "a/eicar/\074img src=x onError=alert\0501\051\076.jpg" "b/eicar/\074img src=x onError=alert\0501\051\076.jpg"
new file mode 100644
index 0000000..9daeafb
--- /dev/null
+++ "b/eicar/\074img src=x onError=alert\0501\051\076.jpg"
@@ -0,0 +1 @@
+test
diff --git a/eicar/eicar.jpg b/eicar/eicar.jpg
new file mode 100644
index 0000000..704cac8
--- /dev/null
+++ b/eicar/eicar.jpg
@@ -0,0 +1 @@
+X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*
diff --git a/eicar/eicar.pdf b/eicar/eicar.pdf
new file mode 100644
index 0000000..704cac8
--- /dev/null
+++ b/eicar/eicar.pdf
@@ -0,0 +1 @@
+X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*
diff --git a/search_dump.sh b/search_dump.sh
index 560ffc5..7c1902a 100755
--- a/search_dump.sh
+++ b/search_dump.sh
@@ -14,7 +14,7 @@
 mkdir /mnt/$RNDNO
 
 echo Mounting NAS
-mount -t cifs //192.168.0.13/NAS /mnt/$RNDNO -o username=[redacted],password=[redacted],vers=1.0
+mount -t cifs //192.168.0.13/NAS /mnt/$RNDNO -o username=nanoymaster,password=***REMOVED***,vers=1.0
 cd /mnt/$RNDNO/DB_Dumps/bigDB
 
 echo Searching for $TERM in $PWD \(Est. 1hr\)...