Added FB/TW auth, needs more work though