add bathroom works
merge conflicts resolved