wrapping up households
fixing conflict and adding total logic