Refactor request class. Probably breaks all functionality.