Some changes
Initial home implementation