Updated to use Cargo
Resolved some merge conflicts