Initial FB integration
merged commits