Renamed feature file
Worked on authorization stuff
Merged