User and Client API complete.  Auth, Token and polish remaining.