Added unit tracking, selection and moving