Started working on tracker by unit view