Worked on authentication a bit more