working on auth
finished merges