Thought better of some TODOs
Extracted PersonWheresiesSupport