Basic FB integration added
Conflicts resolved