Rewrote Cargo.java
Merge origin/master