Starting to implement auth better