Working on auth some more;