Getting withHome stuff to work with new state.