Reworked auth, more client work