First draft of wrap-hook implementation