3.7 wip - hooks

as requested a while ago