diff --git a/.gitignore b/.gitignore
index f19d591..112c10a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 .cache
 .vscode
 build/cache/
+build/deploy-ti/
 build/tmp/
+build/tmp-k3r5/
 build/bitbake-cookerdaemon.log
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 58750d1..45737b7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,11 @@
 	path = poky
 	url = https://git.yoctoproject.org/poky
 	branch = scarthgap
+[submodule "layers/meta-arm"]
+	path = layers/meta-arm
+	url = git://git.yoctoproject.org/meta-arm
+	branch = scarthgap
+[submodule "layers/meta-ti"]
+	path = layers/meta-ti
+	url = git://git.yoctoproject.org/meta-ti
+	branch = scarthgap
diff --git a/README.md b/README.md
index b57b3fa..e8a56c9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Yocto template
+# Yocto Beagleplay Playground
 
-Template for a yocto workspace to use with docker.
+Playground to get started with yocto and the Beagleplay
 
 ## Requirements
 
diff --git a/build/conf/bblayers.conf b/build/conf/bblayers.conf
index b6f5711..9c2ee94 100644
--- a/build/conf/bblayers.conf
+++ b/build/conf/bblayers.conf
@@ -9,4 +9,9 @@ BBLAYERS ?= " \
   /home/yocto/ws/poky/meta \
   /home/yocto/ws/poky/meta-poky \
   /home/yocto/ws/poky/meta-yocto-bsp \
-  "
+  /home/yocto/ws/layers/meta-arm/meta-arm \
+  /home/yocto/ws/layers/meta-arm/meta-arm-toolchain \
+  /home/yocto/ws/layers/meta-ti/meta-beagle \
+  /home/yocto/ws/layers/meta-ti/meta-ti-bsp \
+  /home/yocto/ws/layers/meta-ti/meta-ti-extras \
+  "
\ No newline at end of file
diff --git a/build/conf/local.conf b/build/conf/local.conf
index c52f344..f1a2ca9 100644
--- a/build/conf/local.conf
+++ b/build/conf/local.conf
@@ -36,7 +36,7 @@
 #MACHINE ?= "genericx86-64"
 #
 # This sets the default machine to be qemux86-64 if no other machine is selected:
-MACHINE ??= "qemux86-64"
+MACHINE ??= "beagleplay"
 
 # These are some of the more commonly used values. Looking at the files in the
 # meta/conf/machine directory, or the conf/machine directory of any additional layers
@@ -147,6 +147,7 @@ DISTRO ?= "poky"
 # meta/classes-recipe/core-image.bbclass for more details.
 # We default to enabling the debugging tweaks.
 EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+IMAGE_INSTALL:append = " vim apt"
 
 #
 # Additional image features
diff --git a/layers/meta-arm b/layers/meta-arm
new file mode 160000
index 0000000..a81c199
--- /dev/null
+++ b/layers/meta-arm
@@ -0,0 +1 @@
+Subproject commit a81c19915b5b9e71ed394032e9a50fd06919e1cd
diff --git a/layers/meta-ti b/layers/meta-ti
new file mode 160000
index 0000000..ea8c0b1
--- /dev/null
+++ b/layers/meta-ti
@@ -0,0 +1 @@
+Subproject commit ea8c0b1cf1ab8a0b327e3feb1144c1ccf05b8278