collapse and split homeshick out into its own