WIP: Simplify Request class and it's subclasses.