Feature/hooks

Resolves #32