Initial working commit for authentication control