User Authentication in Progress
Sorting Merge Conflicts
Still working on Authentication