diff --git a/keyboards/dichotomy/config.h b/keyboards/dichotomy/config.h
old mode 100755
new mode 100644
diff --git a/keyboards/dichotomy/dichotomy.c b/keyboards/dichotomy/dichotomy.c
index 41e12090c..b94030a37 100755
--- a/keyboards/dichotomy/dichotomy.c
+++ b/keyboards/dichotomy/dichotomy.c
@@ -63,10 +63,13 @@ void pointing_device_task(void){
 }
 
 void led_init(void) {
-	DDRD  |= (1<<1);
-	PORTD |= (1<<1);
-	DDRF  |= (1<<4) | (1<<5);
-	PORTF |= (1<<4) | (1<<5);
+    setPinOutput(D1);
+    setPinOutput(F5);
+    setPinOutput(F6);
+
+	writePinHigh(D1);
+    writePinHigh(F5);
+    writePinHigh(F6);
 }
 
 
diff --git a/keyboards/dichotomy/dichotomy.h b/keyboards/dichotomy/dichotomy.h
index 4355a1c90..2023259b1 100755
--- a/keyboards/dichotomy/dichotomy.h
+++ b/keyboards/dichotomy/dichotomy.h
@@ -5,12 +5,16 @@
 #include "pointing_device.h"
 #include "quantum.h"
 
-#define red_led_off()   PORTF |= (1<<6)
-#define red_led_on()    PORTF &= ~(1<<6)
-#define blu_led_off()   PORTF |= (1<<5)
-#define blu_led_on()    PORTF &= ~(1<<5)
-#define grn_led_off()   PORTD |= (1<<1)
-#define grn_led_on()    PORTD &= ~(1<<1)
+#define red_led_off()   writePinHigh(F6)
+#define red_led_on()    writePinLow(F6)
+#define blu_led_off()   writePinHigh(F5)
+#define blu_led_on()    writePinLow(F5)
+#define grn_led_off()   writePinHigh(D1)
+#define grn_led_on()    writePinLow(D1)
+
+#define red_led(flag)   if (flag) red_led_on(); else red_led_off()
+#define blu_led(flag)   if (flag) blu_led_on(); else blu_led_off()
+#define grn_led(flag)   if (flag) grn_led_on(); else grn_led_off()
 
 #define set_led_off()     red_led_off(); grn_led_off(); blu_led_off()
 #define set_led_red()     red_led_on();  grn_led_off(); blu_led_off()
diff --git a/keyboards/dichotomy/keymaps/beat/config.h b/keyboards/dichotomy/keymaps/beat/config.h
new file mode 100644
index 000000000..f31e7469f
--- /dev/null
+++ b/keyboards/dichotomy/keymaps/beat/config.h
@@ -0,0 +1,19 @@
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define TAPPING_TERM 200
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/dichotomy/keymaps/beat/keymap.c b/keyboards/dichotomy/keymaps/beat/keymap.c
new file mode 100644
index 000000000..c686d77d6
--- /dev/null
+++ b/keyboards/dichotomy/keymaps/beat/keymap.c
@@ -0,0 +1,126 @@
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _MOUSE,
+    _ADJUST
+};
+
+enum dichotomy_keycodes {
+  MS_BTN1 = SAFE_RANGE,
+  MS_BTN2,
+  MS_BTN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT( /* Base layout, nearly qwerty but with modifications because it's not a full keyboard. Obviously. */
+  KC_ESCAPE,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+  KC_TAB,      KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+  KC_LSFT,     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, TT(_MOUSE),
+                                 KC_LGUI, KC_LALT, KC_DEL,     KC_RCTL, KC_RALT, KC_RGUI,
+               MS_BTN3, SFT_T(KC_ESCAPE), KC_LCTL, KC_SPC,     KC_SPC,  TT(_RAISE), TT(_LOWER),   MS_BTN3
+  ),
+
+  [_RAISE] = LAYOUT( /* Shifted layout, small changes (because angle brackets have been moved to thumb cluster buttons) */
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT,        KC_MUTE, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+  _______, _______, KC_GRV,  _______, _______, KC_MPRV,        _______, KC_LABK, KC_RABK, KC_BSLS, KC_QUOT, _______,
+                             _______, _______, _______,        _______, _______, _______,
+                    _______, _______, _______, _______,        _______, _______, _______, _______
+  ),
+
+  [_LOWER] = LAYOUT( /* Number layout, basically the main function layer */
+  _______, KC_EXLM, KC_AT,    KC_HASH, KC_DLR,  KC_PERC,       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+  _______, _______, KC_VOLD,  KC_VOLU, KC_MPLY, KC_MNXT,       KC_MUTE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
+  _______, _______, KC_TILD,  _______, _______, KC_MPRV,       _______, _______, _______, KC_PIPE, KC_DQT,  _______,
+                              _______, _______, _______,       _______, _______, _______,
+                     _______, _______, _______, _______,       _______, _______, _______, _______
+  ),
+
+  [_ADJUST] = LAYOUT( /* Shifted number/function layout, for per-key control.  Only active when shift is held, and number is toggled or held */
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,          KC_PSLS, KC_P7,   KC_P8,   KC_P9, KC_PMNS, _______,
+  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,         KC_PAST, KC_P4,   KC_P5,   KC_P6, KC_PPLS, _______,
+  _______, _______, _______, LGUI(KC_L), KC_PSCR, KC_APP,      KC_PCMM, KC_P1,   KC_P2,   KC_P3, KC_PEQL, _______,
+                             _______, _______, _______,        _______, KC_P0,   KC_PDOT,
+                    _______, _______, _______, _______,        _______, _______, _______, _______
+  ),
+
+  [_MOUSE] = LAYOUT( /* Mouse layer, including buttons for clicking. */
+  _______, _______, _______, _______, _______, _______,        KC_VOLU, KC_HOME, KC_WH_U, KC_PGUP, _______, _______,
+  _______, _______, MS_BTN2, MS_BTN3, MS_BTN1, _______,        KC_VOLD, MS_BTN1, MS_BTN3, MS_BTN2, _______, _______,
+  _______, _______, _______, _______, _______, _______,        KC_HOME, KC_END,  KC_WH_D, KC_PGDN, _______, _______,
+                             _______, KC_UP,   _______,        _______, KC_UP,   _______,
+                    _______, KC_LEFT, KC_DOWN, KC_RGHT,        KC_LEFT, KC_DOWN, KC_RGHT, _______
+  )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    red_led(layer_state_cmp(state, _LOWER));
+    grn_led(layer_state_cmp(state, _RAISE));
+    blu_led(layer_state_cmp(state, _MOUSE));
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+#define SetBitMask(variable, mask, on) if (on) variable |= mask; else variable &= ~mask
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    report_mouse_t currentReport;
+	switch (keycode) {
+		//mouse buttons, for 1-3, to update the mouse report:
+		//MOUSE_BTN1-3 are consts defined in report.h
+		case MS_BTN1:
+			currentReport = pointing_device_get_report();
+			SetBitMask(currentReport.buttons, MOUSE_BTN1, record->event.pressed);
+			pointing_device_set_report(currentReport);
+			return false;
+		case MS_BTN2:
+			currentReport = pointing_device_get_report();
+			SetBitMask(currentReport.buttons, MOUSE_BTN2, record->event.pressed);
+			pointing_device_set_report(currentReport);
+			return false;
+		case MS_BTN3:
+			currentReport = pointing_device_get_report();
+			SetBitMask(currentReport.buttons, MOUSE_BTN3, record->event.pressed);
+			pointing_device_set_report(currentReport);
+			return false;
+        case KC_WH_U:
+			currentReport = pointing_device_get_report();
+            if(record->event.pressed) {
+                currentReport.v += 1;
+            }
+            else {
+                currentReport.v = 0;
+            }
+			pointing_device_set_report(currentReport);
+			return false;
+        case KC_WH_D:
+			currentReport = pointing_device_get_report();
+            if(record->event.pressed) {
+                currentReport.v -= 1;
+            }
+            else {
+                currentReport.v = 0;
+            }
+            pointing_device_set_report(currentReport);
+			return false;
+	}
+	return true;
+}
diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c
index f14c90128..d93889e6a 100755
--- a/keyboards/dichotomy/matrix.c
+++ b/keyboards/dichotomy/matrix.c
@@ -92,9 +92,6 @@ uint8_t matrix_cols(void) {
 }
 
 void matrix_init(void) {
-    DDRF |= (1<<6);
-    DDRF |= (1<<5);
-    DDRD |= (1<<1);
     matrix_init_quantum();
 }