Home refactor 1.2