Added more boilerplate stuff and social auth