trying to fix phone funkiness
Merge branch 'newhome' into testing