diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4944d241..0261b86b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,58 @@
 
 This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large.
 
+## TShock 4.3.6 (Pre-Release)
+
+* API: NPCs shoot the right way (@WhiteXZ)
+* API: The server config file works correctly with priority and port (@Patrikkk)
+* API: Removed support for favorites and removed JSON dependencies. (@Enerdy)
+* API: Removed support for clouds. (@Enerdy)
+* API: Fixed a whole lot of bugs with wiring, and in general re-wrote some core bits that were bugged. (@WhiteXZ)
+* API: Fixed projectile AI bugs. (@AndrioCelos)
+* API: Fixed world saving problems. (WhiteXZ)
+* API: Fixed server not accepting more connections once max slots was filled. (@WhiteXZ)
+* API: Removed startup parameters and moved them to TShock. (@Cleant)
+* API: Item.SetDefaults() no longer kills some tools. (@Enerdy)
+* API: Restored chat bubbles. (@WhiteXZ)
+* API: Updated to 1.3.0.6. (@Enerdy & @Patrikkk)
+* API: Lots and I mean lots of network improvements in the SendQ department. (@tylerjwatson)
+* API: Added NpcLootDrop and DropBossBag hooks. (@Patrikkk)
+* API: Fixed hook: NpcTriggerPressurePlate (@Patrikkk)
+* API: Fixed hook: ProjectileTriggerPressurePlate (@Patrikkk)
+* API: Fixed hook: ItemSetDefaultsString (@Patrikkk)
+* API: Fixed hook: ItemSetDefaultsInt (@Patrikkk)
+* API: Fixed hook: ItemNetDefaults (@Patrikkk)
+* API: Fixed hook: GameStatueSpawn (@Patrikkk)
+* API: Fixed hook: NpcNetDefaults (@Patrikkk)
+* API: Fixed hook: NpcNetSetDefaultsString (@Patrikkk)
+* API: Fixed hook: NpcNetSetDefaultsInt (@Patrikkk)
+* API: Fixed hook: NpcSpawn (@Patrikkk)
+* API: Fixed hook: NpcTransformation (@Patrikkk)
+* API: Fixed hook: NpcStrike (@Patrikkk)
+* API: Updated AssemblyInfo to 1.3.0.6. (@nicatronTg)
+* API: Moved to .NET Framework 4.5. (@tylerjwatson)
+* API: Dedicated server input thread doesn't run if input is redirected/piped. (@tylerjwatson)
+* API: Wiring.cs methods are now public. (@Stealownz)
+* API: Added PlayerTriggerPressurePlate hook. (@Patrikkk)
+* API: API Version Tick to 1.20.
+* The config option disabling the DCU has been deprecated and will be removed in a future release. (@nicatronTg)
+* Fixed bubble tile triggering noclip checks. (@Enerdy)
+* Updated projectile handling in GetDataHandlers. (@WhiteXZ)
+* Fixed issue #992. (@WhiteXZ)
+* Teleport handler now handles wormholes. (@WhiteXZ)
+* Fixed tall gates and trap doors (issue #998). (@WhiteXZ)
+* Added monoliths to orientable tiles (issue #999). (@WhiteXZ)
+* Fixed vortex stealth armor (issue #964). (@WhiteXZ)
+* Added moon lord to spawn boss. (@WhiteXZ)
+* Fixed serverpassword syntax error error message. (@JordyMoos)
+* Fixed issue #1019. (@WhiteXZ)
+* Fix: Region protection prevents placement of objects. (@Patrikkk)
+* Moved all startup parameters to TShock. (@Cleant)
+* Fix: Target dummies are no longer butchered. (@Denway)
+* Added projectile 465 to the ignore list, which fixes some other issues. (@Enerdy)
+* Fix: Logging out is now safe with SSC (/logout) (issue #1037). (@WhiteXZ)
+* API/TShock: Removed -world parameter from TShock, put it back in the API. (@tylerjwatson)
+
 ## TShock 4.3.5 (Unreleased)
 
 * Fix HandleSpawnBoss, and as a result the spawnboss command and boss spawning items. (@Ijwu)
@@ -15,7 +67,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 
 ## TShock 4.3.3
 
-* Fix dihydrogen monoxide (@Wolfje)
+* Fix dihydrogen monoxide (@tylerjwatson)
 * Whitelist another boss projectile (@Patrikkk, @WhiteXZ)
 
 ## TShock 4.3.2