https://twitter.com/elonmusk/status/588082574183903232
https://www.youtube.com/watch?v=C9I55o8hQgs
Admittedly, he also replicated all the other possible failure modes too. Turns out landing on barges is hard.
Perhaps a barge full of Tesla batteries and electromagnets could grab and hold it as it comes in?
https://twitter.com/elonmusk/status/588082574183903232