New ShipOdyssey merging in Ryan's changes v2013-05-02