Create a way to filter requests/responses into different buckets
extract common constructor logic
Actually use the bucket!