Server changes
Socket shit
Merged everything
Fix