diff --git a/roles/init-server/handlers/core.yml b/roles/init-server/handlers/core.yml
index d6df33e..c7d180e 100644
--- a/roles/init-server/handlers/core.yml
+++ b/roles/init-server/handlers/core.yml
@@ -1,11 +1,23 @@
 # SPDX-License-Identifier: MIT-0
 ---
 # handlers file for roles/init-vps
-- name: Setting up Radicle
-  ansible.builtin.include_tasks:
-    file: tasks/contingent/pkg/radicle.yml
-  listen: radicle
+- name: Skipping to next installaton
+  ansible.builtin.debug:
+    msg: "No post-installaton or additional installation steps needed--continuing..."
+  listen: default
 - name: Setting up ViM
   ansible.builtin.include_tasks:
     file: tasks/contingent/pkg/vim.yml
   listen: vim
+- name: Setting up Headscale
+  ansible.builtin.include_tasks:
+    file: tasks/contingent/pkg/headscale.yml
+  listen: headscale
+- name: Setting up Git
+  ansible.builtin.include_tasks:
+    file: tasks/contingent/pkg/git.yml
+  listen: git
+- name: Setting up TOR
+  ansible.builtin.include_tasks:
+    file: tasks/contingent/pkg/tor.yml
+  listen: tor
diff --git a/roles/init-server/tasks/contingent/pkg/headscale.yml b/roles/init-server/tasks/contingent/pkg/headscale.yml
new file mode 100644
index 0000000..91751c2
--- /dev/null
+++ b/roles/init-server/tasks/contingent/pkg/headscale.yml
@@ -0,0 +1,38 @@
+---
+- name: Acquiring home of current user
+  when: ansible_facts["system"] == "Linux"
+  ansible.builtin.shell:
+    cmd: "echo ~{{ ansible_user }}"
+  register: ansible_user_home
+- name: Acquiring current user
+  when: ansible_facts["system"] == "Linux"
+  ansible.builtin.shell:
+    cmd: "echo {{ ansible_user }}"
+- name: Configuring Headscale
+  become: true
+  ansible.builtin.template:
+    src: headscale/config.yaml.j2
+    dest: /etc/headscale/config.yaml
+    owner: root
+    group: root
+    mode: "644"
+    force: true
+    backup: true
+- name: Starting SystemD service
+  become: true
+  ansible.builtin.systemd_service:
+    name: headscale
+    scope: system
+    enabled: true
+    state: started
+- name: Registering a headscale user
+  become: true
+  ansible.builtin.command:
+    # cmd: "headscale users create {{ item.username }} -d '{{ item.dname }}' -e '{{ item.email }}' -p '{{ pfp | default(default_pfp) }}'"
+    cmd: "headscale users create {{ item.username }} -d '{{ item.dname }}' -e '{{ item.email }}'"
+  # vars:
+  #   default_pfp: ~
+  register: headscale_registration
+  changed_when:
+    - "'User created' in headscale_registration.stdout"
+    - headscale_registration.rc == 0
\ No newline at end of file
diff --git a/roles/init-server/tasks/contingent/pkg/tor.yml b/roles/init-server/tasks/contingent/pkg/tor.yml
new file mode 100644
index 0000000..35e17a3
--- /dev/null
+++ b/roles/init-server/tasks/contingent/pkg/tor.yml
@@ -0,0 +1,8 @@
+---
+- name: Starting and enabling TOR daemon service
+  become: true
+  ansible.builtin.systemd_service:
+    name: tor
+    scope: system
+    enabled: true
+    state: started
\ No newline at end of file
diff --git a/roles/init-server/tasks/contingent/pkg/vim.yml b/roles/init-server/tasks/contingent/pkg/vim.yml
index 05f20fa..918215b 100644
--- a/roles/init-server/tasks/contingent/pkg/vim.yml
+++ b/roles/init-server/tasks/contingent/pkg/vim.yml
@@ -40,32 +40,10 @@
   become: true
   become_user: "{{ current_user.stdout }}"
   ansible.builtin.template:
-    src: vimrc.j2
+    src: user/vimrc.j2
     dest: "{{ ansible_user_home.stdout }}/.vimrc"
     owner: "{{ ansible_user }}"
     group: "{{ ansible_user }}"
     force: true
     backup: true
-  vars:
-    vim_spatialize: true
-    vim_tabgap: 2
-    vim_blockedcursor: true
-    vim_historyspan: 500
-    vim_origami: true
-    vim_eddelimiters: true
-    vim_gitspice: true
-    vim_statusline: true
-    vim_fancycomment: true
-    vim_idelangs: true
-    vim_pathcompletion: true
-    vimignore:
-      - "*.docx"
-      - "*.jpg"
-      - "*.png"
-      - "*.gif"
-      - "*.pdf"
-      - "*.pyc"
-      - "*.exe"
-      - "*.flv"
-      - "*.img"
-      - "*.xlsx"
+  # @TODO run command to make sure plugins referenced in 'vimrc' are installed