Authorization here needs to be handled a bit differently. I added some checking back.