Working on hooks

Hooks still broken