Feature/35 auth