Some progress with auth