row is probably a better term for this
be more explicit about what we're doing in wrap-hooks
add some hooks for good measure