Working on Home Integration

Not there yet