Oops yeah, I tried to DRY it up (couldn't get it to work cause of the `included` scoping)