Sounds good. I might extend the elevator scene just a tad anyways. Maybe a quick shot of R2 turning it on as the ship is dropping. Considering that After Phantom Menace it seems that he can magnetize himself. Like he did while making repairs to the ship. If im not mistaken.
I'll try to get that last elevator shot in as I'm working on that.