[NTheEndAgain] Finally add #65. There's a lot of work here.