Adding authentication mechanics, properly masks included as well