Cleaned up FB functions, prepep to integrate with Sean's latest