Fixes / Moving social stuff for experiment