Home, refactor with partial, begin 9.4