Working on reworking auth