Auth working, tidy up next