Numbers now use i64 instead of str