Wip/fix home