diff --git a/systems/aarch64/pinephone.nix b/systems/aarch64/peebee/pinephone.nix
similarity index 100%
rename from systems/aarch64/pinephone.nix
rename to systems/aarch64/peebee/pinephone.nix
diff --git a/systems/aarch64/pinebook-pro.nix b/systems/aarch64/pinebook-pro.nix
new file mode 100644
index 0000000..aef143f
--- /dev/null
+++ b/systems/aarch64/pinebook-pro.nix
@@ -0,0 +1,128 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports =
+    [
+#        <nixos-hardware/pine64/pinebook-pro>
+        ./hardware-configuration.nix
+#       ./programs.nix
+    ];
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  boot.loader = {
+    efi = {
+    canTouchEfiVariables = false;
+  };
+
+  grub = {
+    enable = true;
+    efiInstallAsRemovable = true;
+    efiSupport = true;
+    version = 2;
+    device = "nodev";
+    };
+  };
+
+  boot.initrd.kernelModules = [
+    # Rockchip modules
+    "rockchip_rga"
+    "rockchip_saradc"
+    "rockchip_thermal"
+    "rockchipdrm"
+
+    # GPU/Display modules
+    "analogix_dp"
+    "cec"
+    "drm"
+    "drm_kms_helper"
+    "dw_hdmi"
+    "dw_mipi_dsi"
+    "gpu_sched"
+    "panel_edp"
+    "panel_simple"
+    "panfrost"
+    "pwm_bl"
+
+    # USB / Type-C related modules
+    "fusb302"
+    "tcpm"
+    "typec"
+
+    # Misc. modules
+    "cw2015_battery"
+    "gpio_charger"
+    "rtc_rk808"
+  ];
+
+  nix.settings.auto-optimise-store = true;
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix.gc = {
+     automatic = true;
+     dates = "weekly";
+     options = "--delete-older-than 30d";
+   };
+
+  networking = {
+    hostName = "jaal";
+    networkmanager.enable = true;
+  };
+
+  # Set your time zone.
+  time.timeZone = "America/Denver";
+
+  environment.systemPackages = 
+            with pkgs; 
+            [
+              firefox
+              git
+              git-lfs
+              neofetch
+              unzip
+              wget
+            ]; 
+
+  # Define user accounts
+    users.users.aaronh = {
+            description = "Aaron Honeycutt";
+            home = "/home/aaronh";
+            extraGroups = [ "wheel" "networkmanager" "adm"];
+            isNormalUser = true;
+            hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx.";
+
+    packages = with pkgs; [
+      fish
+    ];
+
+    shell = pkgs.fish;
+    };
+
+  # Enable Pipewire
+    security.rtkit.enable = true;
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
+ 
+  # Turn off PulseAudio
+  hardware.pulseaudio.enable = false;
+
+  # Enable Bluetooth
+  hardware.bluetooth.enable = true;
+
+  # Enable the OpenSSH daemon
+  services.openssh.enable = true;
+
+  # Enable CUPS
+  services.printing.enable = true;
+
+  # Allow Unfree
+  nixpkgs.config.allowUnfree = true;
+
+  # System 
+  system.stateVersion = "22.11";
+  system.autoUpgrade.enable = true;
+
+}