@raydavis is there any way we can be more DRY here? This feels like a lot of copy/pasting. Not a blocker though.