Merge with Robs stuff. Working facebook auth on my phone.