diff --git a/Firmware/GPAD_API/FIRMWARE_VERSION b/Firmware/GPAD_API/FIRMWARE_VERSION
index f985c60d..5eaf2b65 100644
--- a/Firmware/GPAD_API/FIRMWARE_VERSION
+++ b/Firmware/GPAD_API/FIRMWARE_VERSION
@@ -1 +1 @@
-0.58.6
+0.58.7
diff --git a/doc/BOMs/Parts_BOM.md b/doc/BOMs/Parts_BOM.md
new file mode 100644
index 00000000..d72a3457
--- /dev/null
+++ b/doc/BOMs/Parts_BOM.md
@@ -0,0 +1,20 @@
+# Bill of Materials (BOM)
+
+| Item | Manufacturer | PN | Description | Qty | Supplier | Datasheet | Purchase Link | Notes |
+|-----:|--------------|----|-------------|----:|----------|-----------|---------------|-------|
+| 1 | Generic | N/A | 2.54 mm 0.1" 1×8 Pin Female Socket Header, Single Row, Pack of 30 | 1 | Amazon | Manufacturer specification | Amazon product page | PCB socket headers |
+| 2 | Small Parts | 0206BTP | Steel Sheet Metal Screw, Zinc Plated, Pan Head, Star Drive, Type B, #2-32 × 3/8" | 1 | Amazon | Manufacturer specification | Amazon product page | Mechanical hardware |
+| 3 | PNY | N/A | 32 GB Elite Class 10 U1 microSDHC Flash Memory Card | 6 | PNY / Amazon | PNY Product Page | Amazon product page | Storage media |
+| 4 | Haldzemo | 2004A | 20×4 LCD Display Module, Blue Backlight, 5 V | 3 | Amazon | HD44780 LCD Datasheet | Amazon product page | Character LCD |
+| 5 | EBOOT | N/A | 5 mm White LED, Pack of 100 | 1 | Amazon | Generic 5 mm LED Datasheet | Amazon product page | Indicator LED |
+| 6 | Generic | N/A | 5 mm Red LED, Pack of 100 | 1 | Amazon | Generic 5 mm LED Datasheet | Amazon product page | Indicator LED |
+| 7 | Cricklewood Electronics | N/A | Cricklewood Electronics | N/A | **3 in (76 mm) Full-Range Round Speaker, 8 Ω, 10 W** | 1 | https://cricklewoodelectronics.com/3-inch-10W-Full-Range-Round-8-ohm-Speaker.html | https://cricklewoodelectronics.com/3-inch-10W-Full-Range-Round-8-ohm-Speaker.html | **Preferred speaker. Confirmed working unit.** |
+| 8 | Mr. Pen | N/A | M3 Nuts & Bolts Assortment Kit | 1 | Amazon | Product specification | Amazon product page | Mechanical hardware |
+| 9 | Generic | DFPlayer Mini | MP3 Audio Decoder Module | 2 | Amazon | DFPlayer Mini Datasheet | Amazon product page | Audio playback module |
+| 10 | Robosource | N/A | Nylon Spacer, 1/8" Thick | 1 | Amazon | Product specification | Amazon product page | PCB spacers |
+| 11 | California JOS | N/A | 2-Pin Jumper Caps (2.54 mm) | 1 pack | Amazon | Product specification | https://www.amazon.com/California-JOS-Standard-Circuit-Connection/dp/B0BRK36G33 | Header jumpers |
+| 12 | Sabrent | CB-DB9P | USB-to-RS232 Serial Adapter | 2 | Amazon | https://sabrent.com/products/cb-db9p | https://www.amazon.com/Sabrent-Converter-Prolific-Chipset-CB-DB9P/dp/B00IDSM6BW | DTE/DCE communication |
+| 13 | Lamroyce | N/A | DB9 Female-to-Female Gender Changer | 1 | Amazon | Product specification | https://www.amazon.com/Lamroyce-Connector-Extender-HD-RS232-Transfer/dp/B0FDFXM23S | RS-232 adapter |
+| 14 | Generic | N/A | DB9 Null Modem Adapter | 1 | Amazon | Product specification | https://www.amazon.com/female-slimline-transfer-serial-adapter/dp/B075XHWVSJ | TX/RX crossover |
+| 15 | StarTech | N/A | 2 m DB9 RS-232 Cable, Male-to-Female | 1 | Amazon | StarTech Product Page | https://www.amazon.com/StarTech-com-Black-RS232-Serial-Modem/dp/B00CEMGMMM | Serial extension cable |
+| 16 | Unknown | B0D7Q9HJLQ | 20 Sets Mini Micro JST-PH 2.0mm 2 Pin Male Connector | 1 | Amazon | TBD | https://www.amazon.com/gp/product/B0D7Q9HJLQ | Awaiting product identification |