refactored bits
Merge branch 'develop' into refactoring-concerns
refactored user concerns
some refactoring for hound
Merge pull request #1141 from fairmondo/refactoring-concerns

Refactoring concerns