Started working on updating to match Rust compiler