diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64921ae..f22a154 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,69 @@
+# [3.6.0](https://github.com/UCSD-E4E/smartfin-fw3/compare/v3.5.0...v3.6.0) (2025-01-07)
+
+
+### Bug Fixes
+
+* Abstracted particle specific methods ([913fa96](https://github.com/UCSD-E4E/smartfin-fw3/commit/913fa960cd8af21638512247013b8329015c935c))
+* Adds __SPISettings ([d47eaec](https://github.com/UCSD-E4E/smartfin-fw3/commit/d47eaecd1641cff93bde2de249a46fbcbe9c6d63))
+* Adds debugCommands.cpp ([9279017](https://github.com/UCSD-E4E/smartfin-fw3/commit/9279017136bde9c2314ca96eb0897a02391cb966))
+* Adds dummies ([b718051](https://github.com/UCSD-E4E/smartfin-fw3/commit/b71805193620b5cc45ccb8bf6a729bc86d6c5555))
+* Adds dummy classes ([8735504](https://github.com/UCSD-E4E/smartfin-fw3/commit/87355041fb5a91d479b20ede1fa0fa57a0478830))
+* Adds dummy classes ([a5eb618](https://github.com/UCSD-E4E/smartfin-fw3/commit/a5eb618f2be710cc6207cd6acb0b33be595a980b))
+* Adds dummy EEPROM ([1cdac32](https://github.com/UCSD-E4E/smartfin-fw3/commit/1cdac32884bbc1c75f98d47311c9f4ff13d409a8))
+* Adds dummy modules ([2d099bc](https://github.com/UCSD-E4E/smartfin-fw3/commit/2d099bc513dc3241f7ac6d839bee71f028393acb))
+* Adds dummy modules ([e923893](https://github.com/UCSD-E4E/smartfin-fw3/commit/e923893b2da656c710bd8b09fa2a41490a48b921))
+* Adds dummy Serial ([4dd1d5e](https://github.com/UCSD-E4E/smartfin-fw3/commit/4dd1d5eaa0392b10b7ae1e129b18dc033c8c7a83))
+* Adds fileCLI ([45a69ef](https://github.com/UCSD-E4E/smartfin-fw3/commit/45a69ef0a7266d2981fe65d9398022ea67436f55))
+* Adds flog and conio ([5584ff9](https://github.com/UCSD-E4E/smartfin-fw3/commit/5584ff9eae36d9002c2ee334d463fbe7330a0171))
+* Adds functional include ([c204edf](https://github.com/UCSD-E4E/smartfin-fw3/commit/c204edf1a2248ea9ca04d93a88d531bb2c0961ae))
+* Adds GPS includes ([94e0e77](https://github.com/UCSD-E4E/smartfin-fw3/commit/94e0e77c0326fbac6dc039a14dc640f2f9bf9023))
+* Adds LED ([db7c473](https://github.com/UCSD-E4E/smartfin-fw3/commit/db7c473c3156ed6b3dab78cf2aad10c44e0ac0ad))
+* Adds location service getLocation ([50f0538](https://github.com/UCSD-E4E/smartfin-fw3/commit/50f0538b26185c83520393c8bd8de23861817379))
+* Adds LocationService dummy ([4f1f1f8](https://github.com/UCSD-E4E/smartfin-fw3/commit/4f1f1f8a528f4171ea114c8cbe3501d1f1ffbfd7))
+* Adds logger ([39ae403](https://github.com/UCSD-E4E/smartfin-fw3/commit/39ae40346b97528349feb747c6665cbd1616997d))
+* Adds LogLevel dummy ([7b73d0d](https://github.com/UCSD-E4E/smartfin-fw3/commit/7b73d0dac9b65ddb4c746a66cf22e34ea2ab5b12))
+* Adds Particle ([d70a187](https://github.com/UCSD-E4E/smartfin-fw3/commit/d70a1875d7d101d15e0637b7324032400a8d7949))
+* Adds Serial Write ([d82b475](https://github.com/UCSD-E4E/smartfin-fw3/commit/d82b47534176c8d9041af3351b96c33556ebb5ba))
+* Adds sigint handlers ([278314f](https://github.com/UCSD-E4E/smartfin-fw3/commit/278314f975b4d3b0adf7c51859187ec392ab76f9))
+* Adds SPI for PC HAL ([0360073](https://github.com/UCSD-E4E/smartfin-fw3/commit/03600735820341d8c9fdf6b5926fc2a217fbe863))
+* Adds SPIClass dummy ([1de15cc](https://github.com/UCSD-E4E/smartfin-fw3/commit/1de15cc05ecb32330a881c5d5f77b37bc442f091))
+* Adds stdarg ([17489a5](https://github.com/UCSD-E4E/smartfin-fw3/commit/17489a589464b1912edb1d25115f655d144d5b09))
+* Adds String dummy ([340a931](https://github.com/UCSD-E4E/smartfin-fw3/commit/340a9317601f3339a7275884b677bcf229c91fe0))
+* Adds String methods ([531fd5c](https://github.com/UCSD-E4E/smartfin-fw3/commit/531fd5c2a7ab388132aadf9e759a4644c8108e77))
+* Adds System dummy ([43b8e25](https://github.com/UCSD-E4E/smartfin-fw3/commit/43b8e25d827f4ca5b87a7ea16a3f7c1cdafed744))
+* Adds system.cpp ([66670f1](https://github.com/UCSD-E4E/smartfin-fw3/commit/66670f1654910395324e2fdaec846242ab88781c))
+* Adds Timer dummy class ([eacf510](https://github.com/UCSD-E4E/smartfin-fw3/commit/eacf51077b6bc4c73ee4fcbf44534a3f3f0cb465))
+* Adds USARTSerial dummy class ([b35a691](https://github.com/UCSD-E4E/smartfin-fw3/commit/b35a6911b8d7150a222aa83dcbec966be3aec9c2))
+* CRC and SHA256 only on Particle ([14be8ff](https://github.com/UCSD-E4E/smartfin-fw3/commit/14be8ff6a6a3b1823f2c5fcfffeee74b592ceb8e))
+* Disables recorder ([ef08445](https://github.com/UCSD-E4E/smartfin-fw3/commit/ef08445f970a98214e7929c8a808fcc2e59911e0))
+* Dummy I2C ([8712770](https://github.com/UCSD-E4E/smartfin-fw3/commit/871277080bbc1b430b3f9818ebd65afb7ddabda7))
+* Fixes docs ([376e21f](https://github.com/UCSD-E4E/smartfin-fw3/commit/376e21f6ca331f25783b36d699b0a2608bb9ea15))
+* Implemented dummy location service ([dcdf943](https://github.com/UCSD-E4E/smartfin-fw3/commit/dcdf943bfc986ae4302cabd981f6caebd5034239))
+* Implements EEPROM ([0dad497](https://github.com/UCSD-E4E/smartfin-fw3/commit/0dad497046e55a4f721cd45fa5f555b753d3b42d))
+* Implements LEDSystemTheme ([3ac0640](https://github.com/UCSD-E4E/smartfin-fw3/commit/3ac0640b70bcef3f5d80c0db7b8ff8eb18ff4c5e))
+* Implements pin functions ([5041831](https://github.com/UCSD-E4E/smartfin-fw3/commit/5041831fa2ec5ed7624f06e44a119fecbcdd53d7))
+* Implements waterSensor ([200d869](https://github.com/UCSD-E4E/smartfin-fw3/commit/200d8697a63b037c662ccf746bbc3003f111bcab))
+* IMU dummy ([45d06d6](https://github.com/UCSD-E4E/smartfin-fw3/commit/45d06d6b1c4e233d0b671405ef6c488d1335e864))
+* Removes unused function ([5b40a24](https://github.com/UCSD-E4E/smartfin-fw3/commit/5b40a249b2bb71b5d3ce93374856312bcad14ed3))
+* renames getline to SF_OSAL_getline ([a372b9c](https://github.com/UCSD-E4E/smartfin-fw3/commit/a372b9c74ee23e1a2bcbe5559564e76892abc943))
+* Replaces kbhit ([6745b45](https://github.com/UCSD-E4E/smartfin-fw3/commit/6745b45651aa112a6b32535e1bf68b28a5eaf9db))
+* Replaces newline constant ([a95d92f](https://github.com/UCSD-E4E/smartfin-fw3/commit/a95d92f2855d13ee7072f18230c7fe4de670774c))
+* systemCommands compile ([5819e4f](https://github.com/UCSD-E4E/smartfin-fw3/commit/5819e4f9c01ae797af310d17a13ca48eab16a99d))
+* Updates deploy.cpp for PC HAL ([e13d7b3](https://github.com/UCSD-E4E/smartfin-fw3/commit/e13d7b3640d01daf41df5ef62256d382a4ef8ec5))
+* Updates platform values ([d8397fd](https://github.com/UCSD-E4E/smartfin-fw3/commit/d8397fd46b0b5f25a745f9bc5ca24f0c5e2e16dc))
+* util compile ([9769a34](https://github.com/UCSD-E4E/smartfin-fw3/commit/9769a349cef42b059726a82cac36fd043765b800))
+
+
+### Features
+
+* Adds basic conio ([782972c](https://github.com/UCSD-E4E/smartfin-fw3/commit/782972c6a16d28d2b96d007217641336aac5b541))
+* Adds glibc implementation ([044ef73](https://github.com/UCSD-E4E/smartfin-fw3/commit/044ef73cd6e3ecbd4d3b22dd83ae36791c82d16f))
+* Adds pc hal ([1e87b30](https://github.com/UCSD-E4E/smartfin-fw3/commit/1e87b30e3cf851a65994438e33df9bda88dae3ee))
+* Adds printf ([b8b53ce](https://github.com/UCSD-E4E/smartfin-fw3/commit/b8b53ce9fd122da6455595b3c67084f5aaf87755))
+* Adds utils random ([c4126e1](https://github.com/UCSD-E4E/smartfin-fw3/commit/c4126e12f48ec0292bc549dc325178aada7cdd10))
+* Basic ncurses interface ([6c2b358](https://github.com/UCSD-E4E/smartfin-fw3/commit/6c2b358839f90893df81b3ab9d6112e445ae0241))
+* Switches getch ([cb92f7a](https://github.com/UCSD-E4E/smartfin-fw3/commit/cb92f7a6851d10a39f3653f0fa37ab372479040c))
+
 # [3.5.0](https://github.com/UCSD-E4E/smartfin-fw3/compare/v3.4.0...v3.5.0) (2025-01-07)
 
 
diff --git a/src/vers.hpp b/src/vers.hpp
index d9673fb..678cb21 100644
--- a/src/vers.hpp
+++ b/src/vers.hpp
@@ -11,7 +11,7 @@
 #include "product.hpp"
 
 #define FW_MAJOR_VERSION    3
-#define FW_MINOR_VERSION    5
+#define FW_MINOR_VERSION    6
 #define FW_BUILD_NUM        0
 #define FW_BRANCH           ""