Working on go home loop for units