Started working on authorization