diff --git a/.gitignore b/.gitignore
index d2d63ed98612b69e0bb748cd74a300734f41e1a2..9df3b454f410d9279fb0a25c11ee4fbb2d9e752c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,9 @@ build
 *.sublime-project
 
 .vscode/*
-
 store.json
 scripts/event_header_generator/generated/
 scripts/event_header_generator/venv/
+
+**/generated
+**/scxmls
diff --git a/scripts/eventgen.sh b/scripts/eventgen.sh
index 1ba5dcbee04cd32474b355df5cc7c61301ecc698..6763addd5072948bc8e191ff4e61e4c31c20494a 100755
--- a/scripts/eventgen.sh
+++ b/scripts/eventgen.sh
@@ -1,11 +1,25 @@
 #!/bin/bash
 
-DIRNAME="$(dirname $0)"
-python3  $DIRNAME/../skyward-boardcore/scripts/eventgen/eventgen.py $(find $DIRNAME/../src/boards -name "*.scxml")
-
-rm -r $DIRNAME/generated
-mkdir $DIRNAME/generated
-mv generated/* $DIRNAME/generated
-rm -r generated
+# Copyright (c) 2021 Skyward Experimental Rocketry
+# Authors: Alberto Nidasio
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
-echo "The generated files are in the scripts/generated/ folder"
\ No newline at end of file
+DIRNAME="$(dirname $0)"
+$DIRNAME/../skyward-boardcore/scripts/generators/eventgen.py $@
diff --git a/scripts/fsmgen.sh b/scripts/fsmgen.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2bae83d7f938ec78624784bfbb93aaa0f17e4431
--- /dev/null
+++ b/scripts/fsmgen.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Copyright (c) 2021 Skyward Experimental Rocketry
+# Authors: Alberto Nidasio
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+DIRNAME="$(dirname $0)"
+$DIRNAME/../skyward-boardcore/scripts/generators/fsmgen.py $@
diff --git a/skyward-boardcore b/skyward-boardcore
index bc67604abf3ceaf08b8772803ddeb99c64696c15..de97a15f6606ac76f9111b8dfc18e10f2b54cc50 160000
--- a/skyward-boardcore
+++ b/skyward-boardcore
@@ -1 +1 @@
-Subproject commit bc67604abf3ceaf08b8772803ddeb99c64696c15
+Subproject commit de97a15f6606ac76f9111b8dfc18e10f2b54cc50