IDM-27 WIP on Auth