manual merge of pauls house

manual merge