Update to rust master

You're gonna have to go over this lib with me as well, I can't figure out where to start...