First implementations of the new home
This is done before merging