Auth

Start of reducing the circular dependencies