Yes, this is going to be moved to `auth` -- this is the next task in my schedule.