big refactoring, add fb intergration