prod socket
Fixing prod
Cleaning merges
Fixing styles
Fixing issues
Final Commit for Project