Hi mike! Warp works well but could use better support for multiple windows from the same app. Right now, it seems like it matches windows of the same app arbitrarily (in the order it finds them?) so if you have, say, multiple terminals, browsers, or Xcode editor/organizer windows open it can swap their positions around when restoring, even if you just saved and the windows are already in the correct place. Idea: I suggest using the window's current size/position/title as weighted matching criteria so that when it is trying to fill each saved slot, if there are multiple candidates to go there, it will choose the one most "similar" first, and most of all never dislodges a window that hasn't moved. For instance, if there are 3 saved terminal windows slots to restore, do an initial pass and "fill" any slot where there is already a terminal window with the exact right bounds. Then do a second pass and fill any remaining slots where a window's score based on its similarity in width/height/title to its saved counterpart is used to prioritize the "best" fit. Doing two passes instead of one prevents the case where a window to be restored first with no exact match steals from a later one that does.