Updated Ship class, untested