Woof

* Changes from Hound review