Renamed a few things, and added Furville's TODO
Forget the other changes...