Wip/fix home

I have been updating testing this quite extensively, and I have never seen a race condition whatsoever.