test hook works now
needs refactor
merge