Update for cargo, attempt to get it working