Migrate to cargo (p076-p080)