Major changes, finish authentication