WIP: More canonical request stuff