Wip/fix home

heh, now you just dropped onFail to ignore my comments about it over on the other PR :-)