After a day of nightmare I think I've finally got unit command system / move group stack where I'm happy