facebook with login works
merging conflicts
merging MOAR conflicts