Started to refactor authentication into a request class to prepare for Enterprise networks