half way through reverting to old authentication
resolved conflict
Added finished authentication