Swap functionality, list checks now save state if changed