Huge changes: cargo hold, added optionals