changed cargohold methods, deleted all(hopefully) of james' stuff