Well, not exactly the X-Wing you might be thinking of. Space X continues to improve its Falcon 9R (R for reusable). It has now added small fins with a sort of X shaped grille work. This allows for even more control. It’s still a scary landing. Additionally, Elon Musk intends to build high-tech floating landing pads for the craft.

Falcon 9R test flight from June

Story with more pictures…

Elon Musk shows off rockets with ‘X-wings’ and landing pads in the sea