Still preparing the big rewrite of Request

Will be fun!