Redo swap logic and finish first attemptInsertAt() draft