SO MANY THINGS TO CHANGE. tHIS WAS ABOUT LOGGING IN
Fixed merge conflicts