Refactored. Hound come at me