Semi-final form. Auth issues fixed by now.