Begin refactoring requests into separate classes