updating shit
merging authentication-ah