add home computer rubbies
update tests and fix merge conflicts