Substantial changes to VesselSimulator