Started to Add Authentication
merging
merge conflicts