finish saving for changeLineupList... Loads of work.
merge fixes