Added household scaffold
Merge branch 'household'
fix branch