Incoming rust rewrite branch ready to merge: +1,009,257 -4,024