Replied to your TODO, and also did some things that I don't remember.