diff --git a/modules/utilities/windows/adobereader/adobereader.pp b/modules/utilities/windows/adobereader/adobereader.pp
new file mode 100644
index 000000000..8f6afc258
--- /dev/null
+++ b/modules/utilities/windows/adobereader/adobereader.pp
@@ -0,0 +1 @@
+include adobereader::install
diff --git a/modules/utilities/windows/adobereader/manifests/install.pp b/modules/utilities/windows/adobereader/manifests/install.pp
new file mode 100644
index 000000000..551dd5ae5
--- /dev/null
+++ b/modules/utilities/windows/adobereader/manifests/install.pp
@@ -0,0 +1,6 @@
+class adobereader::install {
+ package { 'adobereader':
+ provider => chocolatey,
+ ensure => '2015.007.20033.02',
+ }
+}
diff --git a/modules/utilities/windows/adobereader/secgen_metadata.xml b/modules/utilities/windows/adobereader/secgen_metadata.xml
new file mode 100644
index 000000000..78640f16e
--- /dev/null
+++ b/modules/utilities/windows/adobereader/secgen_metadata.xml
@@ -0,0 +1,25 @@
+
+
+
+ Adobe Acrobat Reader DC
+ Oscar Langford
+ James Davis
+ MIT
+ Adobe Acrobat Reader DC software is the free, trusted global standard for viewing, printing, signing, sharing, and annotating PDFs.
+
+ win_documents
+ windows
+
+ https://acrobat.com/
+ Adobe Reader
+ non-free license
+
+
+
+ bases/.*
+ linux
+
+
+
diff --git a/modules/utilities/windows/keepass/keepass.pp b/modules/utilities/windows/keepass/keepass.pp
new file mode 100644
index 000000000..0216267ca
--- /dev/null
+++ b/modules/utilities/windows/keepass/keepass.pp
@@ -0,0 +1,3 @@
+include keepass::install
+# We will remove this for now. Install is fine. This probably belongs in a generator anyway?
+# include keepass::config
diff --git a/modules/utilities/windows/keepass/manifests/config.pp b/modules/utilities/windows/keepass/manifests/config.pp
new file mode 100644
index 000000000..4a4c48c18
--- /dev/null
+++ b/modules/utilities/windows/keepass/manifests/config.pp
@@ -0,0 +1,21 @@
+# keepass/manifests/config.pp
+
+class keepass::config {
+ $leaked_passwords = ['password1', 'password2']
+ $leaked_usernames = ['user1', 'user2']
+ $known_password = 'securepassword'
+
+ file { 'C:\\Users\\timbo_win7\\Desktop\\modules\\keepass\\files\\sample.kdbx':
+ ensure => present,
+ source => 'puppet:///modules/keepass/sample.kdbx',
+ require => Package['keepass'],
+ notify => Exec['add_entry_to_keepass'],
+ }
+
+ exec { 'add_entry_to_keepass':
+ command => 'powershell.exe -ExecutionPolicy Bypass -File "C:\\Users\\timbo_win7\\Desktop\\modules\\keepass\\Add-KeepassEntry.ps1" -DatabasePath "C:\\Users\\timbo_win7\\Desktop\\modules\\keepass\\files\\sample.kdbx" -MasterPassword "securepassword" -Username "user1" -Password "password1"',
+ provider => 'powershell',
+ refreshonly => true,
+ subscribe => File['C:\\Users\\timbo_win7\\Desktop\\modules\\keepass\\files\\sample.kdbx'],
+ }
+}
diff --git a/modules/utilities/windows/keepass/manifests/install.pp b/modules/utilities/windows/keepass/manifests/install.pp
new file mode 100644
index 000000000..7046879ec
--- /dev/null
+++ b/modules/utilities/windows/keepass/manifests/install.pp
@@ -0,0 +1,6 @@
+class keepass::install {
+ package { 'keepass':
+ provider => chocolatey,
+ ensure => installed,
+ }
+}
diff --git a/modules/utilities/windows/keepass/secgen_metadata.xml b/modules/utilities/windows/keepass/secgen_metadata.xml
new file mode 100644
index 000000000..6ce1b866b
--- /dev/null
+++ b/modules/utilities/windows/keepass/secgen_metadata.xml
@@ -0,0 +1,25 @@
+
+
+
+ KeePass
+ Oscar Langford
+ James Davis
+ MIT
+ KeePass is a free open source password manager, which helps you to manage your passwords in a secure way.
+
+ win_debugger
+ windows
+
+ https://keepass.info/
+ keepass
+ GPLv2
+
+
+
+ bases/.*
+ linux
+
+
+
diff --git a/modules/utilities/windows/netcat/manifests/install.pp b/modules/utilities/windows/netcat/manifests/install.pp
new file mode 100644
index 000000000..4e319f734
--- /dev/null
+++ b/modules/utilities/windows/netcat/manifests/install.pp
@@ -0,0 +1,6 @@
+class netcat::install {
+ package { 'netcat':
+ provider => chocolatey,
+ ensure => installed,
+ }
+}
diff --git a/modules/utilities/windows/netcat/netcat.pp b/modules/utilities/windows/netcat/netcat.pp
new file mode 100644
index 000000000..475845ece
--- /dev/null
+++ b/modules/utilities/windows/netcat/netcat.pp
@@ -0,0 +1 @@
+include netcat::install
diff --git a/modules/utilities/windows/netcat/secgen_metadata.xml b/modules/utilities/windows/netcat/secgen_metadata.xml
new file mode 100644
index 000000000..5cc87d4b1
--- /dev/null
+++ b/modules/utilities/windows/netcat/secgen_metadata.xml
@@ -0,0 +1,25 @@
+
+
+
+ Netcat
+ Oscar Langford
+ James Davis
+ MIT
+ Netcat (often abbreviated to nc) is a computer networking utility for reading from and writing to network connections using TCP or UDP.
+
+ win_security
+ windows
+
+ https://nmap.org/ncat/
+ netcat
+ custom
+
+
+
+ bases/.*
+ linux
+
+
+
diff --git a/modules/utilities/windows/nginx/manifests/install.pp b/modules/utilities/windows/nginx/manifests/install.pp
new file mode 100644
index 000000000..e834a4694
--- /dev/null
+++ b/modules/utilities/windows/nginx/manifests/install.pp
@@ -0,0 +1,6 @@
+class nginx::install {
+ package { 'nginx-service':
+ provider => chocolatey,
+ ensure => installed,
+ }
+}
diff --git a/modules/utilities/windows/nginx/nginx.pp b/modules/utilities/windows/nginx/nginx.pp
new file mode 100644
index 000000000..1ce1b0b22
--- /dev/null
+++ b/modules/utilities/windows/nginx/nginx.pp
@@ -0,0 +1 @@
+include nginx::install
diff --git a/modules/utilities/windows/nginx/secgen_metadata.xml b/modules/utilities/windows/nginx/secgen_metadata.xml
new file mode 100644
index 000000000..7f255b498
--- /dev/null
+++ b/modules/utilities/windows/nginx/secgen_metadata.xml
@@ -0,0 +1,25 @@
+
+
+
+ nginx
+ Oscar Langford
+ James Davis
+ MIT
+ nginx [engine x] is an HTTP and reverse proxy server, a mail proxy server, a generic TCP/UDP proxy server, as well as a load balancer and an HTTP cache.
+
+ win_services
+ windows
+
+ https://nginx.org/en/
+ nginx
+ BSD2
+
+
+
+ bases/.*
+ linux
+
+
+
diff --git a/modules/utilities/windows/notepadplusplus/manifests/install.pp b/modules/utilities/windows/notepadplusplus/manifests/install.pp
new file mode 100644
index 000000000..2bfb98328
--- /dev/null
+++ b/modules/utilities/windows/notepadplusplus/manifests/install.pp
@@ -0,0 +1,6 @@
+class notepadplusplus::install {
+ package { 'notepadplusplus':
+ provider => chocolatey,
+ ensure => installed,
+ }
+}
diff --git a/modules/utilities/windows/notepadplusplus/notepadplusplus.pp b/modules/utilities/windows/notepadplusplus/notepadplusplus.pp
new file mode 100644
index 000000000..c34321702
--- /dev/null
+++ b/modules/utilities/windows/notepadplusplus/notepadplusplus.pp
@@ -0,0 +1 @@
+include notepadplusplus::install
diff --git a/modules/utilities/windows/notepadplusplus/secgen_metadata.xml b/modules/utilities/windows/notepadplusplus/secgen_metadata.xml
new file mode 100644
index 000000000..94bb45272
--- /dev/null
+++ b/modules/utilities/windows/notepadplusplus/secgen_metadata.xml
@@ -0,0 +1,25 @@
+
+
+
+ NotepadPlusPlus
+ Oscar Langford
+ James Davis
+ MIT
+ Notepad++ is a free (as in "free speech" and also as in "free beer") source code editor and Notepad replacement that supports several languages.
+
+ win_documents
+ windows
+
+ https://notepad-plus-plus.org/
+ notepadplusplus
+ GPLV2
+
+
+
+ bases/.*
+ linux
+
+
+
diff --git a/modules/utilities/windows/vlc/manifests/install.pp b/modules/utilities/windows/vlc/manifests/install.pp
new file mode 100644
index 000000000..be32879c0
--- /dev/null
+++ b/modules/utilities/windows/vlc/manifests/install.pp
@@ -0,0 +1,6 @@
+class vlc::install {
+ package { 'vlc':
+ provider => chocolatey,
+ ensure => installed,
+ }
+}
diff --git a/modules/utilities/windows/vlc/secgen_metadata.xml b/modules/utilities/windows/vlc/secgen_metadata.xml
new file mode 100644
index 000000000..7cf7e2065
--- /dev/null
+++ b/modules/utilities/windows/vlc/secgen_metadata.xml
@@ -0,0 +1,25 @@
+
+
+
+ VLC
+ Oscar Langford
+ James Davis
+ MIT
+ VLC Player
+
+ win_security
+ windows
+
+ https://www.vlc.com
+ vlc
+ non-free license
+
+
+
+ bases/.*
+ linux
+
+
+
diff --git a/modules/utilities/windows/vlc/vlc.pp b/modules/utilities/windows/vlc/vlc.pp
new file mode 100644
index 000000000..f1c4feb48
--- /dev/null
+++ b/modules/utilities/windows/vlc/vlc.pp
@@ -0,0 +1 @@
+include vlc::install