Refactroed classes
About to add request factory