Initial work on the hooks overhaul.