Upgraded to latest Rust + Rust-Emtpy