Reimplements auth - its es betters now