WIP Universal Socials Gateway

fixed issues
Merge conflict