diff --git a/HV.sls b/HV.sls
new file mode 100644
index 0000000..624131e
--- /dev/null
+++ b/HV.sls
@@ -0,0 +1,6 @@
+base:
+
+  'os:Windows':
+    - match: grain
+    - baseWinHV 
+    - utilsWinHV
diff --git a/MAPO.sls b/MAPO.sls
new file mode 100644
index 0000000..880d351
--- /dev/null
+++ b/MAPO.sls
@@ -0,0 +1,30 @@
+base:
+
+  'os:Windows':
+    - match: grain
+    - baseWin 
+    - utilsWin 
+    - browsersWin 
+    - editorsWin
+
+  'os:Ubuntu':
+    - match: grain
+    - base 
+    - editors
+
+  'roles:developer':
+    - match: grain
+    - developWin
+
+  'roles:sqlserver':
+    - match: grain
+    - sqlServer
+
+  'roles:iisserver':
+    - match: grain
+    - iisServer
+
+  'roles:maposerver':
+    - match: grain
+    - vnc
+
diff --git a/base.sls b/base.sls
index bf0d11d..65b63fb 100644
--- a/base.sls
+++ b/base.sls
@@ -19,3 +19,6 @@ mc:
 links2:
   pkg:
     - installed
+etckeeper:
+  pkg:
+    - installed
diff --git a/baseHV.sls b/baseHV.sls
new file mode 100644
index 0000000..8323238
--- /dev/null
+++ b/baseHV.sls
@@ -0,0 +1,32 @@
+explorerpp:
+  chocolatey:
+    - installed
+    - name: explorerplusplus
+notepadpp:
+  chocolatey:
+    - installed
+    - name: notepadplusplus
+sysinternals:
+  chocolatey:
+    - installed
+    - name: sysinternals
+chrome:
+  chocolatey:
+    - installed
+    - name: googlechrome
+7zip:
+  chocolatey:
+    - installed
+    - name: 7zip.install
+totalcommander:
+  chocolatey:
+    - installed
+    - name: totalcommander
+#winscp:
+#  chocolatey:
+#    - installed
+#    - name: winscp
+#putty:
+#  chocolatey:
+#    - installed
+#    - name: putty.install
diff --git a/top.sls b/top.sls
index 880d351..035cb9e 100644
--- a/top.sls
+++ b/top.sls
@@ -1,30 +1,50 @@
 base:
 
-  'os:Windows':
+#  'os:Windows':
+#    - match: grain
+#    - baseWin 
+#    - utilsWin 
+#    - browsersWin 
+#    - editorsWin
+
+  'os:Ubuntu':
+    - match: grain
+    - base 
+    - utils
+    - editors
+
+  'roles:developer':
     - match: grain
     - baseWin 
     - utilsWin 
     - browsersWin 
     - editorsWin
-
-  'os:Ubuntu':
-    - match: grain
-    - base 
-    - editors
-
-  'roles:developer':
-    - match: grain
     - developWin
 
   'roles:sqlserver':
     - match: grain
+    - baseWin 
+    - utilsWin 
+    - browsersWin 
+    - editorsWin
     - sqlServer
 
   'roles:iisserver':
     - match: grain
+    - baseWin 
+    - utilsWin 
+    - browsersWin 
+    - editorsWin
     - iisServer
 
   'roles:maposerver':
     - match: grain
+    - baseWin 
+    - utilsWin 
+    - browsersWin 
+    - editorsWin
     - vnc
 
+  'roles:hvserver':
+    - match: grain
+    - baseHV 
diff --git a/utils.sls b/utils.sls
new file mode 100644
index 0000000..47eb4af
--- /dev/null
+++ b/utils.sls
@@ -0,0 +1,27 @@
+git:
+  pkg:
+    - installed
+ack:
+  pkg:
+    - installed
+sed:
+  pkg:
+    - installed
+mtr:
+  pkg:
+    - installed
+pydf:
+  pkg:
+    - installed
+lftp:
+  pkg:
+    - installed
+wget:
+  pkg:
+    - installed
+aria2:
+  pkg:
+    - installed
+nnn:
+  pkg:
+    - installed
diff --git a/utilsWinHV.sls b/utilsWinHV.sls
new file mode 100644
index 0000000..e893367
--- /dev/null
+++ b/utilsWinHV.sls
@@ -0,0 +1,16 @@
+windirstat:
+  chocolatey:
+    - installed
+    - name: windirstat
+sharex:
+  chocolatey:
+    - installed
+7zip:
+  chocolatey:
+    - installed
+    - name: 7zip.install
+adobereader:
+  chocolatey:
+    - installed
+    - name: adobereader
+
diff --git a/wrkWin.sls b/wrkWin.sls
new file mode 100644
index 0000000..880d351
--- /dev/null
+++ b/wrkWin.sls
@@ -0,0 +1,30 @@
+base:
+
+  'os:Windows':
+    - match: grain
+    - baseWin 
+    - utilsWin 
+    - browsersWin 
+    - editorsWin
+
+  'os:Ubuntu':
+    - match: grain
+    - base 
+    - editors
+
+  'roles:developer':
+    - match: grain
+    - developWin
+
+  'roles:sqlserver':
+    - match: grain
+    - sqlServer
+
+  'roles:iisserver':
+    - match: grain
+    - iisServer
+
+  'roles:maposerver':
+    - match: grain
+    - vnc
+